diff --git a/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx b/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx
index 57ba91f2b2..84b3edf4d2 100644
--- a/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx
+++ b/app/pages/PageEnigma/comps/ControlsTopButtons/ControlsTopButtons.tsx
@@ -130,26 +130,11 @@ export const ControlsTopButtons = () => {
       </div>
 
       <div className="flex gap-2">
-        <Button variant="secondary" onClick={handleButtonCameraView}>
-          Toggle Camera View
-        </Button>
-        <Button
-          onClick={handleTestButton2}
-          className="hover:bg-brand-teriary-400 bg-brand-tertiary focus-visible:outline-brand-tertiary"
-        >
-          Test Button 2
-        </Button>
+    
       </div>
       <div className="flex gap-2">
         {/* <Button onClick={handleButtonSingleFrame}>Render Single Frame</Button>
         <Button onClick={handleButtonTakeFrame}>Take Frame</Button> */}
-        <Button
-          onClick={handleButtonTest}
-          className="hover:bg-brand-teriary-400 bg-brand-tertiary focus-visible:outline-brand-tertiary"
-          style={{ zIndex: 9001 }}
-        >
-          Test
-        </Button>
       </div>
     </div>
   );
diff --git a/app/pages/PageEnigma/js/free_cam.js b/app/pages/PageEnigma/js/free_cam.js
index e6b4a648a7..6fd1e8007c 100644
--- a/app/pages/PageEnigma/js/free_cam.js
+++ b/app/pages/PageEnigma/js/free_cam.js
@@ -59,8 +59,11 @@ class FreeCam extends EventDispatcher {
 				case 'KeyA': this.moveState.left = 1; break;
 				case 'KeyD': this.moveState.right = 1; break;
 
-				case 'Space': this.moveState.up = 1; break;
-				case 'ShiftLeft': this.moveState.down = 1; break;
+				// case 'Space': this.moveState.up = 1; break;
+				// case 'ShiftLeft': this.moveState.down = 1; break;
+
+				case 'KeyQ': this.moveState.down = 1; break;
+				case 'KeyE': this.moveState.up = 1; break;
 
 				case 'ArrowUp': this.moveState.pitchUp = 1; break;
 				case 'ArrowDown': this.moveState.pitchDown = 1; break;
@@ -68,8 +71,8 @@ class FreeCam extends EventDispatcher {
 				case 'ArrowLeft': this.moveState.yawLeft = 1; break;
 				case 'ArrowRight': this.moveState.yawRight = 1; break;
 
-				case 'KeyQ': this.moveState.rollLeft = 1; break;
-				case 'KeyE': this.moveState.rollRight = 1; break;
+				// case 'KeyQ': this.moveState.rollLeft = 1; break;
+				// case 'KeyE': this.moveState.rollRight = 1; break;
 
 
 			}
@@ -98,8 +101,8 @@ class FreeCam extends EventDispatcher {
 				case 'ArrowLeft': this.moveState.yawLeft = 0; break;
 				case 'ArrowRight': this.moveState.yawRight = 0; break;
 
-				case 'KeyQ': this.moveState.up = 0; break;
-				case 'KeyE': this.moveState.down = 0; break;
+				case 'KeyQ': this.moveState.down = 0; break;
+				case 'KeyE': this.moveState.up = 0; break;
 
 				// case 'KeyQ': this.moveState.rollLeft = 0; break;
 				// case 'KeyE': this.moveState.rollRight = 0; break;