diff --git a/examples/crack_branching.cpp b/examples/crack_branching.cpp
index 66b26a0b..fb664945 100644
--- a/examples/crack_branching.cpp
+++ b/examples/crack_branching.cpp
@@ -105,7 +105,6 @@ int main( int argc, char* argv[] )
         };
         particles->updateParticles( exec_space{}, init_functor );
 
-        // FIXME: use createSolver to switch backend at runtime.
         auto cabana_pd = CabanaPD::createSolverFracture<memory_space>(
             inputs, particles, force_model, bc, prenotch );
         cabana_pd->init_force();
diff --git a/examples/elastic_wave.cpp b/examples/elastic_wave.cpp
index ced77329..61c46ed2 100644
--- a/examples/elastic_wave.cpp
+++ b/examples/elastic_wave.cpp
@@ -25,7 +25,6 @@ int main( int argc, char* argv[] )
     {
         Kokkos::ScopeGuard scope_guard( argc, argv );
 
-        // FIXME: change backend at compile time for now.
         using exec_space = Kokkos::DefaultExecutionSpace;
         using memory_space = typename exec_space::memory_space;
 
diff --git a/examples/kalthoff_winkler.cpp b/examples/kalthoff_winkler.cpp
index d56c0082..11479180 100644
--- a/examples/kalthoff_winkler.cpp
+++ b/examples/kalthoff_winkler.cpp
@@ -25,7 +25,6 @@ int main( int argc, char* argv[] )
     {
         Kokkos::ScopeGuard scope_guard( argc, argv );
 
-        // FIXME: change backend at compile time for now.
         using exec_space = Kokkos::DefaultExecutionSpace;
         using memory_space = typename exec_space::memory_space;
 
diff --git a/src/CabanaPD_Solver.hpp b/src/CabanaPD_Solver.hpp
index 381b288e..ac718b31 100644
--- a/src/CabanaPD_Solver.hpp
+++ b/src/CabanaPD_Solver.hpp
@@ -527,50 +527,6 @@ auto createSolverFracture( InputsType inputs,
                                                prenotch );
 }
 
-/*
-template <class MemorySpace, class ForceModel>
-std::shared_ptr<SolverBase> createSolver( Inputs inputs,
-                                          Particles<MemorySpace> particles )
-{
-    std::string device_type = inputs.device_type;
-    if ( device_type.compare( "SERIAL" ) == 0 )
-    {
-#ifdef KOKKOS_ENABLE_SERIAL
-        return std::make_shared<Solver<
-            Kokkos::Device<Kokkos::Serial, Kokkos::HostSpace>, ForceModel>>(
-            inputs, particles );
-#endif
-    }
-    else if ( device_type.compare( "OPENMP" ) == 0 )
-    {
-#ifdef KOKKOS_ENABLE_OPENMP
-        return std::make_shared<Solver<
-            Kokkos::Device<Kokkos::OpenMP, Kokkos::HostSpace>, ForceModel>>(
-            inputs, particles );
-#endif
-    }
-    else if ( device_type.compare( "CUDA" ) == 0 )
-    {
-#ifdef KOKKOS_ENABLE_CUDA
-        return std::make_shared<Solver<
-            Kokkos::Device<Kokkos::Cuda, Kokkos::CudaSpace>, ForceModel>>(
-            inputs, particles );
-#endif
-    }
-    else if ( device_type.compare( "HIP" ) == 0 )
-    {
-#ifdef KOKKOS_ENABLE_HIP
-        return std::make_shared<
-            Solver<Kokkos::Device<Kokkos::Experimental::HIP,
-                                  Kokkos::Experimental::HIPSpace>,
-                   ForceModel>>( inputs, particles );
-#endif
-    }
-
-    log_err( std::cout, "Unknown backend: ", device_type );
-    return nullptr;
-}
-*/
 } // namespace CabanaPD
 
 #endif