diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 42430b3a4c..2e4cb1db0f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3179,7 +3179,6 @@ void Application::update(float deltaTime) {
 
     auto myAvatar = getMyAvatar();
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
-    userInputMapper->update(deltaTime);
 
     controller::InputCalibrationData calibrationData = {
         myAvatar->getSensorToWorldMatrix(),
@@ -3197,6 +3196,8 @@ void Application::update(float deltaTime) {
         }
     }
 
+    userInputMapper->update(deltaTime);
+
     _controllerScriptingInterface->updateInputControllers();
 
     // Transfer the user inputs to the driveKeys
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index c018a76168..8be8b601a4 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -1383,9 +1383,6 @@ void MyAvatar::preRender(RenderArgs* renderArgs) {
         } else {
             DebugDraw::getInstance().removeMarker("rightHandController");
         }
-
-        // AJT: REMOVE
-        DebugDraw::getInstance().addMyAvatarMarker("REFERENCE", glm::quat(), glm::vec3(0.0f, 0.7f, -0.5f), glm::vec4(1));
     }
 
     DebugDraw::getInstance().updateMyAvatarPos(getPosition());
diff --git a/libraries/shared/src/GLMHelpers.cpp b/libraries/shared/src/GLMHelpers.cpp
index b2294f9ef3..d21d88d212 100644
--- a/libraries/shared/src/GLMHelpers.cpp
+++ b/libraries/shared/src/GLMHelpers.cpp
@@ -471,3 +471,11 @@ bool isNaN(glm::quat value) {
     return isNaN(value.w) || isNaN(value.x) || isNaN(value.y) || isNaN(value.z);
 }
 
+glm::mat4 orthoInverse(const glm::mat4& m) {
+    glm::mat4 r = m;
+    r[3] = glm::vec4(0.0f, 0.0f, 0.0f, 1.0f);
+    r = glm::transpose(r);
+    r[3] = -(r * m[3]);
+    r[3][3] = 1.0f;
+    return r;
+}
diff --git a/libraries/shared/src/GLMHelpers.h b/libraries/shared/src/GLMHelpers.h
index 4a37d68240..469ca1fc81 100644
--- a/libraries/shared/src/GLMHelpers.h
+++ b/libraries/shared/src/GLMHelpers.h
@@ -232,4 +232,6 @@ glm::vec2 getFacingDir2D(const glm::mat4& m);
 bool isNaN(glm::vec3 value);
 bool isNaN(glm::quat value);
 
+glm::mat4 orthoInverse(const glm::mat4& m);
+
 #endif // hifi_GLMHelpers_h
diff --git a/plugins/hifiSixense/src/SixenseManager.cpp b/plugins/hifiSixense/src/SixenseManager.cpp
index 67192edebd..9fdce3add4 100644
--- a/plugins/hifiSixense/src/SixenseManager.cpp
+++ b/plugins/hifiSixense/src/SixenseManager.cpp
@@ -481,12 +481,6 @@ void SixenseManager::InputDevice::handlePoseEvent(float deltaTime, const control
     // transform pose into avatar frame.
     auto nextPose = controller::Pose(pos, rot, velocity, angularVelocity).transform(controllerToAvatar);
 
-    if (!left) {
-        // AJT: HACK TO DEBUG IK
-        nextPose.translation = glm::vec3(0.25f, 0.7f, -0.5f);
-        nextPose.rotation = glm::quat();
-    }
-
     if (prevPose.isValid() && (deltaTime > std::numeric_limits<float>::epsilon())) {
         nextPose.velocity = (nextPose.getTranslation() - prevPose.getTranslation()) / deltaTime;