diff --git a/src/KOKKOS/kokkos.cpp b/src/KOKKOS/kokkos.cpp
index 4e96e3218c..8b45c786e5 100644
--- a/src/KOKKOS/kokkos.cpp
+++ b/src/KOKKOS/kokkos.cpp
@@ -33,10 +33,6 @@
 #include <unistd.h>             // for getpid()
 #endif
 
-namespace LAMMPS_NS {
-  void kokkos_lmp_finalize();
-}
-
 #ifdef LMP_KOKKOS_GPU
 
 // for detecting GPU-aware MPI support:
@@ -84,11 +80,6 @@ using namespace LAMMPS_NS;
 int KokkosLMP::is_finalized = 0;
 int KokkosLMP::init_ngpus = 0;
 
-void LAMMPS_NS::kokkos_lmp_finalize()
-{
-  KokkosLMP::finalize();
-}
-
 /* ---------------------------------------------------------------------- */
 
 KokkosLMP::KokkosLMP(LAMMPS *lmp, int narg, char **arg) : Pointers(lmp)
diff --git a/src/main.cpp b/src/main.cpp
index 543833498b..746ccc41e9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,7 +14,7 @@
 #include "lammps.h"
 
 #include "input.h"
-#include "lmppython.h"
+#include "library.h"
 
 #if defined(LAMMPS_EXCEPTIONS)
 #include "exceptions.h"
@@ -32,20 +32,6 @@
 #include <mdi.h>
 #endif
 
-#if defined(LMP_KOKKOS)
-namespace LAMMPS_NS {
-extern void kokkos_lmp_finalize();
-}
-#else
-#include "accelerator_kokkos.h"
-namespace LAMMPS_NS {
-void kokkos_lmp_finalize()
-{
-  KokkosLMP::finalize();
-}
-}
-#endif
-
 using namespace LAMMPS_NS;
 
 /* ----------------------------------------------------------------------
@@ -89,19 +75,19 @@ int main(int argc, char **argv)
     lammps->input->file();
     delete lammps;
   } catch (LAMMPSAbortException &ae) {
-    kokkos_lmp_finalize();
-    Python::finalize();
+    lammps_kokkos_finalize();
+    lammps_python_finalize();
     MPI_Abort(ae.universe, 1);
   } catch (LAMMPSException &) {
-    kokkos_lmp_finalize();
-    Python::finalize();
+    lammps_kokkos_finalize();
+    lammps_python_finalize();
     MPI_Barrier(lammps_comm);
     MPI_Finalize();
     exit(1);
   } catch (fmt::format_error &fe) {
     fprintf(stderr, "fmt::format_error: %s\n", fe.what());
-    kokkos_lmp_finalize();
-    Python::finalize();
+    lammps_kokkos_finalize();
+    lammps_python_finalize();
     MPI_Abort(MPI_COMM_WORLD, 1);
     exit(1);
   }
@@ -112,14 +98,14 @@ int main(int argc, char **argv)
     delete lammps;
   } catch (fmt::format_error &fe) {
     fprintf(stderr, "fmt::format_error: %s\n", fe.what());
-    kokkos_lmp_finalize();
-    Python::finalize();
+    lammps_kokkos_finalize();
+    lammps_python_finalize();
     MPI_Abort(MPI_COMM_WORLD, 1);
     exit(1);
   }
 #endif
-  kokkos_lmp_finalize();
-  Python::finalize();
+  lammps_kokkos_finalize();
+  lammps_python_finalize();
   MPI_Barrier(lammps_comm);
   MPI_Finalize();
 }