diff --git a/library/src/interactor_impl.cxx b/library/src/interactor_impl.cxx
index 361e799307..73c06cc00c 100644
--- a/library/src/interactor_impl.cxx
+++ b/library/src/interactor_impl.cxx
@@ -176,13 +176,6 @@ class interactor_impl::internals
       return;
     }
 
-    // No user defined behavior, use standard behavior
-    vtkRenderWindow* renWin = self->Window.GetRenderWindow();
-    vtkF3DRenderer* ren = vtkF3DRenderer::SafeDownCast(renWin->GetRenderers()->GetFirstRenderer());
-    bool checkColoring = false;
-    bool printColoring = false;
-    bool render = false;
-
     // Available keycodes: None
     switch (keyCode)
     {
@@ -486,7 +479,7 @@ class interactor_impl::internals
   options& Options;
   window_impl& Window;
   scene_impl& Scene;
-  interactor_impl& Interactor; // TODO remove
+  interactor_impl& Interactor;
   animationManager* AnimationManager;
 
   vtkSmartPointer<vtkRenderWindowInteractor> VTKInteractor;
@@ -648,7 +641,6 @@ interactor_impl::interactor_impl(options& options, window_impl& window, scene_im
     {
       if (this->Internals->Options.scene.camera.orthographic.has_value())
       {
-        // Cheatsheet not updating TODO
         this->Internals->Options.scene.camera.orthographic = !this->Internals->Options.scene.camera.orthographic.value();
       }
       else
@@ -663,7 +655,6 @@ interactor_impl::interactor_impl(options& options, window_impl& window, scene_im
     {
       if (this->Internals->Options.render.show_edges.has_value())
       {
-        // Cheatsheet not updating TODO
         this->Internals->Options.render.show_edges = !this->Internals->Options.render.show_edges.value();
       }
       else
diff --git a/testing/baselines/TestInteractionCheatsheet.png b/testing/baselines/TestInteractionCheatsheet.png
index 600df8c0b5..f942bbe527 100644
--- a/testing/baselines/TestInteractionCheatsheet.png
+++ b/testing/baselines/TestInteractionCheatsheet.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:50ed962c423e75685be6511b0aeffba19ae5c711a4ed9de61662b57b9dabaf04
-size 41064
+oid sha256:850ea174db4f8c578f254697c8bcda66c241c68997dff87e1defa45e49ad9b57
+size 41120
diff --git a/testing/baselines/TestInteractionCheatsheetBlackBG.png b/testing/baselines/TestInteractionCheatsheetBlackBG.png
index 372d2d48f0..9e47503565 100644
--- a/testing/baselines/TestInteractionCheatsheetBlackBG.png
+++ b/testing/baselines/TestInteractionCheatsheetBlackBG.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3532eb19cee7a2edf27f50053f35e389ceda0c5414d02f8762c91dacadf848e0
-size 41594
+oid sha256:7cb71788fdfc7a29cf3b27fe54c81a74f2e97a10025b3dcfe5d8e2867a93b604
+size 41669
diff --git a/testing/baselines/TestInteractionCheatsheetScalars.png b/testing/baselines/TestInteractionCheatsheetScalars.png
index e6ec418fb3..999c666658 100644
--- a/testing/baselines/TestInteractionCheatsheetScalars.png
+++ b/testing/baselines/TestInteractionCheatsheetScalars.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:1989f16bbbaf682fb902eee38d96710cac53dd30141ec24cde934773b3a5bed7
-size 46922
+oid sha256:db039ea77041f9887047a1587c4dda49ede5c939c6608b9a1ffae265e0dfcba9
+size 46961
diff --git a/testing/baselines/TestInteractionCheatsheetWhiteBG.png b/testing/baselines/TestInteractionCheatsheetWhiteBG.png
index 437d196018..4aa33662fa 100644
--- a/testing/baselines/TestInteractionCheatsheetWhiteBG.png
+++ b/testing/baselines/TestInteractionCheatsheetWhiteBG.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c27f7d2a0429de420305bc94f8b27c7c372332352e0d9be0722264519f3b49d
-size 40396
+oid sha256:6863b05619b71d1ac49e38b5b104afcea6325616310f078c21fb9c8f61131550
+size 40447
diff --git a/vtkext/private/module/vtkF3DRenderer.cxx b/vtkext/private/module/vtkF3DRenderer.cxx
index a7f6024dfe..a366235d4e 100644
--- a/vtkext/private/module/vtkF3DRenderer.cxx
+++ b/vtkext/private/module/vtkF3DRenderer.cxx
@@ -1417,8 +1417,6 @@ void vtkF3DRenderer::ConfigureCheatSheet()
     cheatSheetText << "\n 1: Front View camera\n";
     cheatSheetText << " 3: Right View camera\n";
     cheatSheetText << " 4: Roll the camera left by 90 degrees\n";
-
-    vtkCamera* camera = GetActiveCamera();
     cheatSheetText << " 5: Toggle Orthographic Projection "
       << (this->UseOrthographicProjection.has_value() ? (this->UseOrthographicProjection.value() ? "[ON]" : "[OFF]") : "[unset]") << "\n";
     cheatSheetText << " 6: Roll the camera right by 90 degrees\n";