diff --git a/libraries/render-utils/src/FadeEffect.cpp b/libraries/render-utils/src/FadeEffect.cpp
index 902b8fbab1..88018924d8 100644
--- a/libraries/render-utils/src/FadeEffect.cpp
+++ b/libraries/render-utils/src/FadeEffect.cpp
@@ -28,10 +28,8 @@ FadeEffect::FadeEffect() {
 }
 
 void FadeEffect::build(JobModel& task, const render::Varying& inputs, render::Varying& outputs) {
-    auto editedFadeCategory = task.addJob<FadeJob>("Fade");
-
-    const auto fadeEditInput = FadeEditJob::Input(inputs, editedFadeCategory).asVarying();
-    task.addJob<FadeEditJob>("FadeEdit", fadeEditInput);
+    const auto editedFadeCategory = task.addJob<FadeJob>("Fade");
+    task.addJob<FadeEditJob>("FadeEdit", editedFadeCategory);
 }
 
 render::ShapePipeline::BatchSetter FadeEffect::getBatchSetter() {
diff --git a/libraries/render-utils/src/FadeEffect.h b/libraries/render-utils/src/FadeEffect.h
index d5aab4e1f5..17b5efd28f 100644
--- a/libraries/render-utils/src/FadeEffect.h
+++ b/libraries/render-utils/src/FadeEffect.h
@@ -15,8 +15,7 @@
 
 class FadeEffect {
 public:
-    using Input = render::ItemBounds;
-    using JobModel = render::Task::ModelI<FadeEffect, render::ItemBounds>;
+    using JobModel = render::Task::Model<FadeEffect>;
 
     FadeEffect();
 
diff --git a/libraries/render-utils/src/FadeEffectJobs.cpp b/libraries/render-utils/src/FadeEffectJobs.cpp
index 23abc18683..122b543c05 100644
--- a/libraries/render-utils/src/FadeEffectJobs.cpp
+++ b/libraries/render-utils/src/FadeEffectJobs.cpp
@@ -35,7 +35,7 @@ void FadeEditJob::configure(const Config& config) {
     _isEditEnabled = config.editFade;
 }
 
-void FadeEditJob::run(const render::RenderContextPointer& renderContext, const FadeEditJob::Input& inputs) {
+void FadeEditJob::run(const render::RenderContextPointer& renderContext, const FadeEditJob::Input& input) {
     auto scene = renderContext->_scene;
 
     if (_isEditEnabled) {
@@ -63,7 +63,7 @@ void FadeEditJob::run(const render::RenderContextPointer& renderContext, const F
                     render::Transition::AVATAR_CHANGE
                 };
 
-                auto transitionType = categoryToTransition[inputs.get1()];
+                auto transitionType = categoryToTransition[input];
 
                 transaction.queryTransitionOnItem(_editedItem, [transitionType, scene](render::ItemID id, const render::Transition* transition) {
                     if (transition == nullptr || transition->isFinished || transition->eventType != transitionType) {
diff --git a/libraries/render-utils/src/FadeEffectJobs.h b/libraries/render-utils/src/FadeEffectJobs.h
index fcd55b76ac..4a567d84a5 100644
--- a/libraries/render-utils/src/FadeEffectJobs.h
+++ b/libraries/render-utils/src/FadeEffectJobs.h
@@ -177,13 +177,13 @@ class FadeEditJob {
 public:
 
     using Config = FadeEditConfig;
-    using Input = render::VaryingSet2<render::ItemBounds, FadeCategory>;
+    using Input = FadeCategory;
     using JobModel = render::Job::ModelI<FadeEditJob, Input, Config>;
 
     FadeEditJob() {}
 
     void configure(const Config& config);
-    void run(const render::RenderContextPointer& renderContext, const FadeEditJob::Input& inputs);
+    void run(const render::RenderContextPointer& renderContext, const FadeEditJob::Input& input);
 
 private:
 
diff --git a/libraries/render-utils/src/RenderViewTask.cpp b/libraries/render-utils/src/RenderViewTask.cpp
index fca8c252e6..0748006fb6 100644
--- a/libraries/render-utils/src/RenderViewTask.cpp
+++ b/libraries/render-utils/src/RenderViewTask.cpp
@@ -45,8 +45,7 @@ void RenderViewTask::build(JobModel& task, const render::Varying& input, render:
         // TODO: This doesn't actually do any rendering, it simply processes the fade transactions.  Even though forward rendering
         // doesn't support fading right now, we still need to do this once for both paths, otherwise we are left with orphaned objects
         // after they fade out.  In the future, we should refactor this to happen elsewhere.
-        const auto& opaques = items.get<RenderFetchCullSortTask::Output>().get0()[RenderFetchCullSortTask::OPAQUE_SHAPE];
-        task.addJob<FadeEffect>("FadeEffect", opaques);
+        task.addJob<FadeEffect>("FadeEffect");
     }
 
     // Issue the lighting model, aka the big global settings for the view