diff --git a/libraries/gpu/src/gpu/GLBackendTexture.cpp b/libraries/gpu/src/gpu/GLBackendTexture.cpp
index 044204934c..ee5e1d3bc6 100755
--- a/libraries/gpu/src/gpu/GLBackendTexture.cpp
+++ b/libraries/gpu/src/gpu/GLBackendTexture.cpp
@@ -360,11 +360,8 @@ GLBackend::GLTexture* GLBackend::syncGPUObject(const Texture& texture) {
                     if (bytes && texture.isAutogenerateMips()) {
                         glGenerateMipmap(GL_TEXTURE_2D);
                         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-                    }/* else {
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-                        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-                    }*/
-                
+                    }
+
                     object->_target = GL_TEXTURE_2D;
 
                     syncSampler(texture.getSampler(), texture.getType(), object);
diff --git a/libraries/model/src/model/Skybox.cpp b/libraries/model/src/model/Skybox.cpp
index e516fae583..21b40a54c8 100755
--- a/libraries/model/src/model/Skybox.cpp
+++ b/libraries/model/src/model/Skybox.cpp
@@ -129,7 +129,7 @@ void Skybox::render(gpu::Batch& batch, const ViewFrustum& viewFrustum, const Sky
 
     batch.draw(gpu::TRIANGLE_STRIP, 4);
 
- //   batch.setResourceTexture(SKYBOX_SKYMAP_SLOT, nullptr);
+    batch.setResourceTexture(SKYBOX_SKYMAP_SLOT, nullptr);
 
 }
 
diff --git a/libraries/render-utils/src/Environment.cpp b/libraries/render-utils/src/Environment.cpp
index acb149a3cc..b26d402fa3 100644
--- a/libraries/render-utils/src/Environment.cpp
+++ b/libraries/render-utils/src/Environment.cpp
@@ -62,8 +62,6 @@ void Environment::setupAtmosphereProgram(const char* vertSource, const char* fra
     auto state = std::make_shared<gpu::State>();
     
     state->setCullMode(gpu::State::CULL_NONE);
-  //  state->setDepthTest(false);
-   // state->setDepthTest(true, false, gpu::LESS_EQUAL);
     state->setStencilTest(true, 0xFF, gpu::State::StencilTest(0, 0xFF, gpu::EQUAL, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP, gpu::State::STENCIL_OP_KEEP));
     state->setBlendFunction(true,
                             gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA,
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index 983c2d44ba..0f79dc8b8d 100755
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -314,7 +314,6 @@ const gpu::PipelinePointer& DrawStencilDeferred::getOpaquePipeline() {
 
         auto state = std::make_shared<gpu::State>();
         state->setStencilTest(true, 0xFF, gpu::State::StencilTest(STENCIL_OPAQUE, 0xFF, gpu::ALWAYS, gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_REPLACE, gpu::State::STENCIL_OP_REPLACE));
-       // state->setStencilTest(false, 0xFF, gpu::State::StencilTest(STENCIL_OPAQUE, 0xFF, gpu::ALWAYS, gpu::State::STENCIL_OP_INCR, gpu::State::STENCIL_OP_INCR, gpu::State::STENCIL_OP_INCR));
         state->setColorWriteMask(0);
 
         _opaquePipeline.reset(gpu::Pipeline::create(program, state));
diff --git a/libraries/render-utils/src/drawOpaqueStencil.slf b/libraries/render-utils/src/drawOpaqueStencil.slf
index 883154c624..14feda21e9 100644
--- a/libraries/render-utils/src/drawOpaqueStencil.slf
+++ b/libraries/render-utils/src/drawOpaqueStencil.slf
@@ -13,18 +13,12 @@
 //
 
 in vec2 varTexCoord0;
-out vec4 outFragColor;
 
 uniform sampler2D depthTexture;
 
 void main(void) {
-     //  outFragColor = vec4(varTexCoord0, 0.0, 1.0);
-
-     float depth = texture(depthTexture, varTexCoord0.xy).r;
-    outFragColor = vec4(1.0, 0.0, 0.0, 1.0);
-    if (depth < 1.0) {
-        outFragColor = vec4(0.0, 1.0, 0.0, 1.0);
-    } else {
+    float depth = texture(depthTexture, varTexCoord0.xy).r;
+    if (depth >= 1.0) {
         discard;
     }
 }