diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 86c72391de..392be40dd6 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -156,16 +156,13 @@ void OMW::Engine::go()
     // Start the main rendering loop
     mOgre.start();
 
-    // TODO/FIXME: This hangs
-    //mspCommandServer->stop();
-    // TODO/FIXME: This crashes
-    //delete mpSkyManager;
-
     std::cout << "\nThat's all for now!\n";
 }
 
 OMW::Engine::~Engine()
 {
+//    mspCommandServer->stop();
     delete mWorld;
+    delete mpSkyManager;
 }