diff --git a/apps/openmw/mwinput/inputmanagerimp.hpp b/apps/openmw/mwinput/inputmanagerimp.hpp
index 82b62e79b..bc62ef7dc 100644
--- a/apps/openmw/mwinput/inputmanagerimp.hpp
+++ b/apps/openmw/mwinput/inputmanagerimp.hpp
@@ -259,8 +259,6 @@ namespace MWInput
 
             A_Screenshot,     // Take a screenshot
 
-            A_Screenshot360,  // Take a 360 degree screenshot
-
             A_Inventory,      // Toggle inventory screen
 
             A_Console,        // Toggle console screen
diff --git a/apps/openmw/mwrender/water.cpp b/apps/openmw/mwrender/water.cpp
index 8b047eb84..ee5b0d599 100644
--- a/apps/openmw/mwrender/water.cpp
+++ b/apps/openmw/mwrender/water.cpp
@@ -207,6 +207,7 @@ osg::ref_ptr<osg::Image> readPngImage (const std::string& file)
     return result.getImage();
 }
 
+
 class Refraction : public osg::Camera
 {
 public:
@@ -220,7 +221,7 @@ public:
         setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         setName("RefractionCamera");
 
-        setupCullMask(true);
+        setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting);
         setNodeMask(Mask_RenderToTexture);
         setViewport(0, 0, rttSize, rttSize);
 
@@ -261,12 +262,6 @@ public:
         attach(osg::Camera::DEPTH_BUFFER, mRefractionDepthTexture);
     }
 
-    void setupCullMask(bool enabled)
-    {
-        setCullMask(!enabled ? 0 :
-           Mask_Effect|Mask_Scene|Mask_Terrain|Mask_Actor|Mask_ParticleSystem|Mask_Sky|Mask_Sun|Mask_Player|Mask_Lighting);
-    }
-
     void setScene(osg::Node* scene)
     {
         if (mScene)
@@ -309,9 +304,9 @@ public:
         setSmallFeatureCullingPixelSize(Settings::Manager::getInt("small feature culling pixel size", "Water"));
         setName("ReflectionCamera");
 
-        mReflectActors = Settings::Manager::getBool("reflect actors", "Water");
+        bool reflectActors = Settings::Manager::getBool("reflect actors", "Water");
 
-        setupCullMask(true);
+        setCullMask(Mask_Effect|Mask_Scene|Mask_Terrain|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting|(reflectActors ? Mask_Actor : 0));
         setNodeMask(Mask_RenderToTexture);
 
         unsigned int rttSize = Settings::Manager::getInt("rtt size", "Water");
@@ -339,12 +334,6 @@ public:
         addChild(mClipCullNode);
     }
 
-    void setupCullMask(bool enabled)
-    {
-        setCullMask(!enabled ? 0 :
-            Mask_Effect|Mask_Scene|Mask_Terrain|Mask_ParticleSystem|Mask_Sky|Mask_Player|Mask_Lighting|(mReflectActors ? Mask_Actor : 0));
-    }
-
     void setWaterLevel(float waterLevel)
     {
         setViewMatrix(osg::Matrix::scale(1,1,-1) * osg::Matrix::translate(0,0,2 * waterLevel));
@@ -719,13 +708,4 @@ void Water::clearRipples()
     mSimulation->clear();
 }
 
-void Water::setEffectsEnabled(bool enabled)
-{
-     if (mReflection)
-       mReflection->setupCullMask(enabled); 
-
-     if (mRefraction)
-       mRefraction->setupCullMask(enabled); 
-}
-
 }
diff --git a/apps/openmw/mwrender/water.hpp b/apps/openmw/mwrender/water.hpp
index 6985ddca6..e2413cfa0 100644
--- a/apps/openmw/mwrender/water.hpp
+++ b/apps/openmw/mwrender/water.hpp
@@ -107,7 +107,6 @@ namespace MWRender
         void removeCell(const MWWorld::CellStore* store); ///< remove all emitters in this cell
 
         void clearRipples();
-        void setEffectsEnabled(bool enabled);
 
         void changeCell(const MWWorld::CellStore* store);
         void setHeight(const float height);
diff --git a/apps/openmw/mwstate/statemanagerimp.cpp b/apps/openmw/mwstate/statemanagerimp.cpp
index c643480a9..14ee5adee 100644
--- a/apps/openmw/mwstate/statemanagerimp.cpp
+++ b/apps/openmw/mwstate/statemanagerimp.cpp
@@ -655,4 +655,5 @@ void MWState::StateManager::writeScreenshot(std::vector<char> &imageData) const
 
     std::string data = ostream.str();
     imageData = std::vector<char>(data.begin(), data.end());
+
 }