diff --git a/examples/hydraMove.js b/examples/hydraMove.js
index 236cecab18..46715839c3 100644
--- a/examples/hydraMove.js
+++ b/examples/hydraMove.js
@@ -245,10 +245,12 @@ function handleGrabBehavior(deltaTime) {
 }
 
 // Update for joysticks and move button
+var THRUST_DEAD_ZONE = 0.1;
+var ROTATE_DEAD_ZONE = 0.1;
 function flyWithHydra(deltaTime) {
     var thrustJoystickPosition = Controller.getJoystickPosition(THRUST_CONTROLLER);
     
-    if (thrustJoystickPosition.x != 0 || thrustJoystickPosition.y != 0) {
+    if (Math.abs(thrustJoystickPosition.x) > THRUST_DEAD_ZONE || Math.abs(thrustJoystickPosition.y) > THRUST_DEAD_ZONE) {
         if (thrustMultiplier < MAX_THRUST_MULTIPLIER) {
             thrustMultiplier *= 1 + (deltaTime * THRUST_INCREASE_RATE);
         }
@@ -270,7 +272,7 @@ function flyWithHydra(deltaTime) {
 
     // View Controller
     var viewJoystickPosition = Controller.getJoystickPosition(VIEW_CONTROLLER);
-    if (viewJoystickPosition.x != 0 || viewJoystickPosition.y != 0) {
+    if (Math.abs(viewJoystickPosition.x) > ROTATE_DEAD_ZONE || Math.abs(viewJoystickPosition.y) > ROTATE_DEAD_ZONE) {
 
         // change the body yaw based on our x controller
         var orientation = MyAvatar.orientation;
diff --git a/interface/src/renderer/GeometryCache.cpp b/interface/src/renderer/GeometryCache.cpp
index e2517613df..e523d7e608 100644
--- a/interface/src/renderer/GeometryCache.cpp
+++ b/interface/src/renderer/GeometryCache.cpp
@@ -841,6 +841,8 @@ void GeometryReader::run() {
                 grabLightmaps = false;
             } else if (_url.path().toLower().endsWith("apt8_reboot.fbx")) {
                 lightmapLevel = 4.0f;
+            } else if (_url.path().toLower().endsWith("palaceoforinthilian4.fbx")) {
+                lightmapLevel = 3.5f;
             }
             fbxgeo = readFBX(_reply->readAll(), _mapping, grabLightmaps, lightmapLevel);
         }
diff --git a/interface/src/ui/ApplicationOverlay.cpp b/interface/src/ui/ApplicationOverlay.cpp
index 1307672ad1..305119a019 100644
--- a/interface/src/ui/ApplicationOverlay.cpp
+++ b/interface/src/ui/ApplicationOverlay.cpp
@@ -571,8 +571,6 @@ void ApplicationOverlay::renderControllerPointers() {
     static quint64 pressedTime[NUMBER_OF_MAGNIFIERS] = { 0ULL, 0ULL, 0ULL };
     static bool isPressed[NUMBER_OF_MAGNIFIERS] = { false, false, false };
     static bool stateWhenPressed[NUMBER_OF_MAGNIFIERS] = { false, false, false };
-    static bool triggerPressed[NUMBER_OF_MAGNIFIERS] = { false, false, false };
-    static bool bumperPressed[NUMBER_OF_MAGNIFIERS] = { false, false, false };
 
     const HandData* handData = Application::getInstance()->getAvatar()->getHandData();
 
@@ -613,30 +611,6 @@ void ApplicationOverlay::renderControllerPointers() {
             }
         }
 
-        //Check for UI active toggle
-        if (palmData->getTrigger() == 1.0f) {
-            if (!triggerPressed[index]) {
-                if (bumperPressed[index]) {
-                    Menu::getInstance()->setIsOptionChecked(MenuOption::UserInterface,
-                                                            !Menu::getInstance()->isOptionChecked(MenuOption::UserInterface));
-                }
-                triggerPressed[index] = true;
-            }
-        } else {
-            triggerPressed[index] = false;
-        }
-        if ((controllerButtons & BUTTON_FWD)) {
-            if (!bumperPressed[index]) {
-                if (triggerPressed[index]) {
-                    Menu::getInstance()->setIsOptionChecked(MenuOption::UserInterface,
-                                                            !Menu::getInstance()->isOptionChecked(MenuOption::UserInterface));
-                }
-                bumperPressed[index] = true;
-            }
-        } else {
-            bumperPressed[index] = false;
-        }
-
         //if we have the oculus, we should make the cursor smaller since it will be
         //magnified
         if (OculusManager::isConnected()) {