diff --git a/src/systems/userinput/bindings/vive-user.js b/src/systems/userinput/bindings/vive-user.js
index 1da37128181c77e59a3fbd8c63e836977c032b73..d276867e3c22d6ab4d3d5a9d303ec7bd815c6ae5 100644
--- a/src/systems/userinput/bindings/vive-user.js
+++ b/src/systems/userinput/bindings/vive-user.js
@@ -11,8 +11,6 @@ const lAxis = paths.device.vive.left.axis;
 const lPose = paths.device.vive.left.pose;
 const lJoy = v("left/joy");
 const lJoyScaled = v("left/joy/scaled");
-const lJoyY = v("left/joyY");
-const lJoyYCursorMod = v("left/joyY/cursorMod");
 const lJoyXScaled = v("left/joyX/scaled");
 const lJoyYScaled = v("left/joyY/scaled");
 const lDpadNorth = v("left/dpad/north");
@@ -23,7 +21,6 @@ const lDpadCenter = v("left/dpad/center");
 const lTriggerFalling = v("left/trigger/falling");
 const lTriggerFallingStopDrawing = v("left/trigger/falling/stopDrawing");
 const lGripFallingStopDrawing = v("left/grip/falling/stopDrawing");
-
 const lTriggerRising = v("left/trigger/rising");
 const lTriggerRisingGrab = v("right/trigger/rising/grab");
 const lGripRisingGrab = v("right/grab/rising/grab");
@@ -31,7 +28,6 @@ const lTouchpadRising = v("left/touchpad/rising");
 const lCharacterAcceleration = v("left/characterAcceleration");
 const lGripFalling = v("left/grip/falling");
 const lGripRising = v("left/grip/rising");
-const lGripPressed = v("left/grip/pressed");
 const leftBoost = v("left/boost");
 const lTriggerStartTeleport = v("left/trigger/startTeleport");
 const lDpadCenterStartTeleport = v("left/dpadCenter/startTeleport");
@@ -42,10 +38,6 @@ const rButton = paths.device.vive.right.button;
 const rAxis = paths.device.vive.right.axis;
 const rPose = paths.device.vive.right.pose;
 const rJoy = v("right/joy");
-const rJoyY = v("right/joyY");
-const rJoyYCursorMod = v("right/joyY/cursorMod");
-const rJoyXScaled = v("right/joyX/scaled");
-const rJoyYScaled = v("right/joyY/scaled");
 const rDpadNorth = v("right/dpad/north");
 const rDpadSouth = v("right/dpad/south");
 const rDpadEast = v("right/dpad/east");
@@ -53,14 +45,12 @@ const rDpadWest = v("right/dpad/west");
 const rDpadCenter = v("right/dpad/center");
 const rTriggerFalling = v("right/trigger/falling");
 const rTriggerRising = v("right/trigger/rising");
-const rTouchpadFalling = v("right/touchpad/falling");
 const rTouchpadRising = v("right/touchpad/rising");
 const rightBoost = v("right/boost");
 const rGripRising = v("right/grip/rising");
 const rTriggerRisingGrab = v("right/trigger/rising/grab");
 const rGripRisingGrab = v("right/grab/rising/grab");
 const rGripFalling = v("right/grip/rising");
-const rGripPressed = v("right/grip/pressed");
 const cursorDrop1 = v("right/cursorDrop1");
 const cursorDrop2 = v("right/cursorDrop2");
 const rHandDrop1 = v("right/drop1");
diff --git a/src/systems/userinput/devices/vive-controller.js b/src/systems/userinput/devices/vive-controller.js
index 9f97c5b48ae671e449d7a99350d2abb0ebbfcc54..4430c29aa5fd70aceaa3695f867e68a714488b90 100644
--- a/src/systems/userinput/devices/vive-controller.js
+++ b/src/systems/userinput/devices/vive-controller.js
@@ -59,8 +59,6 @@ export class ViveControllerDevice {
       }
     }
     const el = document.querySelector(this.selector);
-    if (el === "null") {
-    }
     if (el.components["tracked-controls"].controller !== this.gamepad) {
       el.components["tracked-controls"].controller = this.gamepad;
       el.setAttribute("tracked-controls", "controller", this.gamepad.index);
diff --git a/src/systems/userinput/userinput.js b/src/systems/userinput/userinput.js
index 27b9e35664fb83ac1fa816ff187ea5eaa89e0268..ad218856c576d8bdcf47e1931975ff341cdcbf3f 100644
--- a/src/systems/userinput/userinput.js
+++ b/src/systems/userinput/userinput.js
@@ -127,7 +127,7 @@ AFRAME.registerSystem("userinput", {
         console.log(e.gamepad);
         let gamepadDevice;
         if (e.gamepad.id === "OpenVR Gamepad") {
-          for (var i = 0; i < this.activeDevices.length; i++) {
+          for (let i = 0; i < this.activeDevices.length; i++) {
             const activeDevice = this.activeDevices[i];
             if (activeDevice.gamepad && activeDevice.gamepad === e.gamepad) {
               console.warn("ignoring gamepad");