diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 7529c715d8f..c3b432cea43 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -43,6 +43,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
 ];
 var DEFAULT_SCRIPTS_SEPARATE = [
     "system/controllers/controllerScripts.js",
+    "system/controllers/squeezeHands.js",
     "communityScripts/notificationCore/notificationCore.js",
     "simplifiedUI/ui/simplifiedNametag/simplifiedNametag.js",
     {"stable": "system/more/app-more.js", "beta": "https://more.overte.org/more/app-more.js"},
diff --git a/scripts/system/controllers/controllerDispatcher.js b/scripts/system/controllers/controllerDispatcher.js
index 64ee5b5a363..16390a73bfd 100644
--- a/scripts/system/controllers/controllerDispatcher.js
+++ b/scripts/system/controllers/controllerDispatcher.js
@@ -439,8 +439,10 @@ Script.include("/~/system/libraries/controllerDispatcherUtils.js");
                 }
             }
 
+
+            // TODO: These are not used currently, but have severe impact on performace. They can be re-enabled when we have OpenXR support
             // check for hand-tracking "click"
-            _this.checkForHandTrackingClick();
+            //_this.checkForHandTrackingClick();
 
             // bundle up all the data about the current situation
             var controllerData = {
diff --git a/scripts/system/controllers/controllerScripts.js b/scripts/system/controllers/controllerScripts.js
index 088b0fae672..2901f7c0248 100644
--- a/scripts/system/controllers/controllerScripts.js
+++ b/scripts/system/controllers/controllerScripts.js
@@ -14,11 +14,11 @@
 Script.include("controllerDispatcher.js");
 
 var CONTOLLER_SCRIPTS = [
-    "squeezeHands.js",
     "controllerDisplayManager.js",
     "grab.js",
     "toggleAdvancedMovementForHandControllers.js",
-    "handTouch.js",
+    // TODO: These are not used currently. It can be reworked re-enabled when we have OpenXR support
+    //"handTouch.js",
     "mouseLook.js",
     "controllerModules/nearParentGrabOverlay.js",
     "controllerModules/stylusInput.js",
@@ -37,8 +37,9 @@ var CONTOLLER_SCRIPTS = [
     "controllerModules/nearGrabEntity.js",
     "controllerModules/farGrabEntity.js",
     "controllerModules/pushToTalk.js",
-    "controllerModules/trackedHandWalk.js",
-    "controllerModules/trackedHandTablet.js"
+    // TODO: These are not used currently, but have severe impact on performace. They can be re-enabled when we have OpenXR support
+    //"controllerModules/trackedHandWalk.js",
+    //"controllerModules/trackedHandTablet.js"
 ];
 
 //Script.include("../../developer/debugging/scriptMemoryReport.js");