diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index a9ceba8f5a..e513fb7282 100644
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -97,11 +97,8 @@ RenderDeferredTask::RenderDeferredTask()
 void RenderDeferredTask::configure(const Config& config) {
     // Propagate resolution scale to sub jobs who need it
     auto preparePrimaryBufferConfig = config.getConfig<PreparePrimaryFramebuffer>("PreparePrimaryBuffer");
-    auto upsamplePrimaryBufferConfig = config.getConfig<Upsample>("PrimaryBufferUpscale");
     assert(preparePrimaryBufferConfig);
-    assert(upsamplePrimaryBufferConfig);
     preparePrimaryBufferConfig->setResolutionScale(config.resolutionScale);
-    upsamplePrimaryBufferConfig->setProperty("factor", 1.0f / config.resolutionScale);
 }
 
 void RenderDeferredTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
@@ -254,15 +251,11 @@ void RenderDeferredTask::build(JobModel& task, const render::Varying& input, ren
     }
 
     // Upscale to finale resolution
-    //const auto primaryFramebuffer = task.addJob<render::Upsample>("PrimaryBufferUpscale", toneMappedBuffer);
     const auto primaryFramebuffer = task.addJob<render::UpsampleToBlitFramebuffer>("PrimaryBufferUpscale", toneMappedBuffer);
 
     // HUD Layer
     const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(primaryFramebuffer, lightingModel, hudOpaque, hudTransparent).asVarying();
     task.addJob<RenderHUDLayerTask>("RenderHUDLayer", renderHUDLayerInputs);
-
-    // Blit!
-  //  task.addJob<Blit>("Blit", primaryFramebuffer);
 }
 
 RenderDeferredTaskDebug::RenderDeferredTaskDebug() {
diff --git a/libraries/render-utils/src/RenderDeferredTask.h b/libraries/render-utils/src/RenderDeferredTask.h
index ee397d94c7..969094488e 100644
--- a/libraries/render-utils/src/RenderDeferredTask.h
+++ b/libraries/render-utils/src/RenderDeferredTask.h
@@ -156,7 +156,9 @@ class PreparePrimaryFramebufferConfig : public render::Job::Config {
 public:
     float getResolutionScale() const { return resolutionScale; }
     void setResolutionScale(float scale) {
-        resolutionScale = std::max(0.1f, std::min(2.0f, scale));
+        const float SCALE_RANGE_MIN = 0.1f;
+        const float SCALE_RANGE_MAX = 2.0f;
+        resolutionScale = std::max(SCALE_RANGE_MIN, std::min(SCALE_RANGE_MAX, scale));
     }
 
 signals:
diff --git a/libraries/render-utils/src/RenderForwardTask.cpp b/libraries/render-utils/src/RenderForwardTask.cpp
index d361aa4a41..d65ad18aa1 100755
--- a/libraries/render-utils/src/RenderForwardTask.cpp
+++ b/libraries/render-utils/src/RenderForwardTask.cpp
@@ -52,11 +52,8 @@ extern void initForwardPipelines(ShapePlumber& plumber);
 void RenderForwardTask::configure(const Config& config) {
     // Propagate resolution scale to sub jobs who need it
     auto preparePrimaryBufferConfig = config.getConfig<PreparePrimaryFramebufferMSAA>("PreparePrimaryBuffer");
-    auto upsamplePrimaryBufferConfig = config.getConfig<UpsampleToBlitFramebuffer>("PrimaryBufferUpscale");
     assert(preparePrimaryBufferConfig);
-    assert(upsamplePrimaryBufferConfig);
     preparePrimaryBufferConfig->setResolutionScale(config.resolutionScale);
-    upsamplePrimaryBufferConfig->setProperty("factor", 1.0f / config.resolutionScale);
 }
 
 void RenderForwardTask::build(JobModel& task, const render::Varying& input, render::Varying& output) {
@@ -172,10 +169,6 @@ void RenderForwardTask::build(JobModel& task, const render::Varying& input, rend
     // HUD Layer
     const auto renderHUDLayerInputs = RenderHUDLayerTask::Input(primaryFramebuffer, lightingModel, hudOpaque, hudTransparent).asVarying();
     task.addJob<RenderHUDLayerTask>("RenderHUDLayer", renderHUDLayerInputs);
-
-    // Disable blit because we do tonemapping and compositing directly to the blit FBO
-    // Blit!
-    // task.addJob<Blit>("Blit", primaryFramebuffer);
 }
 
 gpu::FramebufferPointer PreparePrimaryFramebufferMSAA::createFramebuffer(const char* name, const glm::uvec2& frameSize, int numSamples) {
diff --git a/libraries/render-utils/src/RenderForwardTask.h b/libraries/render-utils/src/RenderForwardTask.h
index 8cca5ec912..baf7f66c6c 100755
--- a/libraries/render-utils/src/RenderForwardTask.h
+++ b/libraries/render-utils/src/RenderForwardTask.h
@@ -47,7 +47,9 @@ class PreparePrimaryFramebufferMSAAConfig : public render::Job::Config {
 public:
     float getResolutionScale() const { return resolutionScale; }
     void setResolutionScale(float scale) {
-        resolutionScale = std::max(0.1f, std::min(2.0f, scale));
+        const float SCALE_RANGE_MIN = 0.1f;
+        const float SCALE_RANGE_MAX = 2.0f;
+        resolutionScale = std::max(SCALE_RANGE_MIN, std::min(SCALE_RANGE_MAX, scale));
     }
 
     int getNumSamples() const { return numSamples; }
diff --git a/libraries/render/src/render/ResampleTask.cpp b/libraries/render/src/render/ResampleTask.cpp
index 93b2e0e97d..3e9bfec8da 100644
--- a/libraries/render/src/render/ResampleTask.cpp
+++ b/libraries/render/src/render/ResampleTask.cpp
@@ -138,19 +138,12 @@ void Upsample::run(const RenderContextPointer& renderContext, const gpu::Framebu
 
 gpu::PipelinePointer UpsampleToBlitFramebuffer::_pipeline;
 
-void UpsampleToBlitFramebuffer::configure(const Config& config) {
-    _factor = config.factor;
-}
-
 void UpsampleToBlitFramebuffer::run(const RenderContextPointer& renderContext, const Input& input, gpu::FramebufferPointer& resampledFrameBuffer) {
     assert(renderContext->args);
     assert(renderContext->args->hasViewFrustum());
     RenderArgs* args = renderContext->args;
     auto sourceFramebuffer = input;
- //   auto srcFramebuffer = input.get0();
-  //  auto dstFramebuffer = input.get1();
 
-//    resampledFrameBuffer = getResampledFrameBuffer(sourceFramebuffer);
     resampledFrameBuffer = args->_blitFramebuffer;
 
     if (resampledFrameBuffer != sourceFramebuffer) {
diff --git a/libraries/render/src/render/ResampleTask.h b/libraries/render/src/render/ResampleTask.h
index 8b5bbd5c4e..e62b76e6d0 100644
--- a/libraries/render/src/render/ResampleTask.h
+++ b/libraries/render/src/render/ResampleTask.h
@@ -70,21 +70,16 @@ namespace render {
 
     class UpsampleToBlitFramebuffer {
     public:
-       // using Input = render::VaryingSet2<gpu::FramebufferPointer, gpu::FramebufferPointer>;
         using Input = gpu::FramebufferPointer;
-        using Config = UpsampleConfig;
-        using JobModel = Job::ModelIO<UpsampleToBlitFramebuffer, Input, gpu::FramebufferPointer, Config>;
+        using JobModel = Job::ModelIO<UpsampleToBlitFramebuffer, Input, gpu::FramebufferPointer>;
 
-        UpsampleToBlitFramebuffer(float factor = 2.0f) : _factor{ factor } {}
+        UpsampleToBlitFramebuffer() {}
 
-        void configure(const Config& config);
         void run(const RenderContextPointer& renderContext, const Input& input, gpu::FramebufferPointer& resampledFrameBuffer);
 
     protected:
 
         static gpu::PipelinePointer _pipeline;
-
-        float _factor{ 2.0f };
     };
 }