diff --git a/src/SimulationRunner.cc b/src/SimulationRunner.cc
index a882f9556b..67b36dd77e 100644
--- a/src/SimulationRunner.cc
+++ b/src/SimulationRunner.cc
@@ -537,7 +537,8 @@ void SimulationRunner::ProcessSystemQueue()
   if (0 == pending && !this->needsCleanUp)
     return;
 
-  // If additional systems are to be added or removed, stop the existing threads.
+  // If additional systems are to be added or removed, stop the existing
+  // threads.
   this->StopWorkerThreads();
 
   this->needsCleanUp = false;
diff --git a/src/SystemManager.cc b/src/SystemManager.cc
index 96075e3207..2339910d04 100644
--- a/src/SystemManager.cc
+++ b/src/SystemManager.cc
@@ -507,11 +507,6 @@ void SystemManager::ProcessRemovedEntities(
     [&](const SystemIfaceWithParent<ISystemConfigureParameters>& system) {
       return _ecm.IsMarkedForRemoval(system.parent);
     });
-  //SystemInternal null_sys(nullptr, kNullEntity);
-  /*this->systems.RemoveIf([&](const SystemInternal& system) {
-      return _ecm.IsMarkedForRemoval(system.parentEntity);
-    }, null_sys);*/
-
   RemoveFromVectorIf(this->systems, [&](const SystemInternal& system) {
       return _ecm.IsMarkedForRemoval(system.parentEntity);
     });