diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp
index 1f99f190af..74209ce951 100644
--- a/libraries/render-utils/src/LightClusters.cpp
+++ b/libraries/render-utils/src/LightClusters.cpp
@@ -574,8 +574,6 @@ void LightClusteringPass::run(const render::RenderContextPointer& renderContext,
     }
     
     // From the LightStage and the current frame, update the light cluster Grid
- //   auto deferredLightingEffect = DependencyManager::get<DeferredLightingEffect>();
-  //  auto lightStage = deferredLightingEffect->getLightStage();
     auto lightStage = renderContext->_scene->getStage<LightStage>();
     _lightClusters->updateLightStage(lightStage);
     _lightClusters->updateLightFrame(lightStage->_currentFrame, lightingModel->isPointLightEnabled(), lightingModel->isSpotLightEnabled());
diff --git a/libraries/render-utils/src/RenderShadowTask.cpp b/libraries/render-utils/src/RenderShadowTask.cpp
index 2d8f6c0cab..a817a6abff 100644
--- a/libraries/render-utils/src/RenderShadowTask.cpp
+++ b/libraries/render-utils/src/RenderShadowTask.cpp
@@ -35,8 +35,7 @@ void RenderShadowMap::run(const render::RenderContextPointer& renderContext,
     assert(renderContext->args);
     assert(renderContext->args->hasViewFrustum());
 
-  //  auto lightStage = DependencyManager::get<DeferredLightingEffect>()->getLightStage();
-    auto lightStage = renderContext->_scene->getStage<LightStage>("LIGHT_STAGE");
+    auto lightStage = renderContext->_scene->getStage<LightStage>();
 
     LightStage::Index globalLightIndex { 0 };
 
@@ -141,8 +140,7 @@ void RenderShadowTask::configure(const Config& configuration) {
 }
 
 void RenderShadowSetup::run(const render::RenderContextPointer& renderContext, Output& output) {
- //   auto lightStage = DependencyManager::get<DeferredLightingEffect>()->getLightStage();
-    auto lightStage = renderContext->_scene->getStage<LightStage>("LIGHT_STAGE");
+    auto lightStage = renderContext->_scene->getStage<LightStage>();
     const auto globalShadow = lightStage->getShadow(0);
 
     // Cache old render args