diff --git a/apps/opencs/model/settings/usersettings.cpp b/apps/opencs/model/settings/usersettings.cpp
index f38f0cde0..7dac660c3 100644
--- a/apps/opencs/model/settings/usersettings.cpp
+++ b/apps/opencs/model/settings/usersettings.cpp
@@ -161,14 +161,6 @@ void CSMSettings::UserSettings::buildSettingModelDefaults()
         ritd->setDeclaredValues (values);
     }
 
-    declareSection ("debug", "Debug Options");
-    {
-        Setting *mousePicking = createSetting (Type_CheckBox, "mouse-picking", "Debug Render Mouse-Picking");
-        mousePicking->setDefaultValue ("false");
-        mousePicking->setToolTip ("Enable redering debug information for mouse picking. "
-            "This option may be removed in future once the mouse picking feature is completed.");
-    }
-
     declareSection ("table-input", "Table Input");
     {
         QString inPlaceEdit ("Edit in Place");
diff --git a/apps/opencs/view/render/scenewidget.cpp b/apps/opencs/view/render/scenewidget.cpp
index 40bca30b1..1a11ddad3 100644
--- a/apps/opencs/view/render/scenewidget.cpp
+++ b/apps/opencs/view/render/scenewidget.cpp
@@ -417,7 +417,6 @@ namespace CSVRender
     void SceneWidget::updateScene()
     {
         flagAsModified();
-        update();
     }
 
     void SceneWidget::updateOverlay()
diff --git a/apps/opencs/view/render/worldspacewidget.cpp b/apps/opencs/view/render/worldspacewidget.cpp
index a94ad9dfd..62e924a94 100644
--- a/apps/opencs/view/render/worldspacewidget.cpp
+++ b/apps/opencs/view/render/worldspacewidget.cpp
@@ -925,7 +925,5 @@ void CSVRender::WorldspaceWidget::placeObject(const std::string sceneNode, const
 
 bool CSVRender::WorldspaceWidget::isDebug()
 {
-    CSMSettings::UserSettings &userSettings = CSMSettings::UserSettings::instance();
-
-    return userSettings.setting("debug/mouse-picking", QString("false")) == "true" ? true : false;
+    return false;
 }
diff --git a/apps/opencs/view/world/physicssystem.cpp b/apps/opencs/view/world/physicssystem.cpp
index bcf9aeff2..e1acdbbfe 100644
--- a/apps/opencs/view/world/physicssystem.cpp
+++ b/apps/opencs/view/world/physicssystem.cpp
@@ -213,11 +213,6 @@ namespace CSVWorld
         mSceneManagers.push_back(sceneMgr);
     }
 
-    std::list<CSVRender::SceneWidget *> PhysicsSystem::sceneWidgets()
-    {
-        return mSceneWidgets;
-    }
-
     void PhysicsSystem::toggleDebugRendering(Ogre::SceneManager *sceneMgr)
     {
         // FIXME: should check if sceneMgr is in the list
diff --git a/apps/opencs/view/world/physicssystem.hpp b/apps/opencs/view/world/physicssystem.hpp
index d62c5089b..f746ef531 100644
--- a/apps/opencs/view/world/physicssystem.hpp
+++ b/apps/opencs/view/world/physicssystem.hpp
@@ -72,8 +72,6 @@ namespace CSVWorld
 
             std::string sceneNodeToMesh(std::string sceneNodeName);
 
-            std::list<CSVRender::SceneWidget *> sceneWidgets();
-
         private:
 
             void updateSelectionHighlight(std::string sceneNode, const Ogre::Vector3 &position);