diff --git a/src/components/look-on-mobile.js b/src/components/look-on-mobile.js
index 4c068669b8769c4bb9ec781e744e916bdc53bad3..e8047c92f491c62cb582df32a9b550955557de3a 100644
--- a/src/components/look-on-mobile.js
+++ b/src/components/look-on-mobile.js
@@ -1,5 +1,4 @@
 const PolyfillControls = AFRAME.utils.device.PolyfillControls;
-const PI_4 = Math.PI / 4;
 const TWOPI = Math.PI * 2;
 
 const abs = Math.abs;
@@ -64,7 +63,7 @@ AFRAME.registerComponent("look-on-mobile", {
     this.cameraController = cameraController;
   },
 
-  tick(t, dt) {
+  tick() {
     if (!this.data.enabled) return;
     const scene = this.el.sceneEl;
     if (scene.is("vr-mode") && scene.checkHeadsetConnected()) return; // TODO: Why would this be ticking if we're in vr-mode?
diff --git a/src/hub.js b/src/hub.js
index 23cfc97b179d03df7f70d8969d984071cadfd999..e92f94f05b9bba9811343b9e835dd8650d0e8e16 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -252,8 +252,9 @@ const onReady = async () => {
         cursorEl.addEventListener("componentinitialized", registerCursor);
       }
     } else {
-      window.APP.touchEventsHandler = new TouchEventsHandler(); // TODO: Do not create TouchEventsHandler unless on mobile
+      window.APP.touchEventsHandler = new TouchEventsHandler();
       window.APP.mouseEventsHandler = new MouseEventsHandler();
+      window.APP.gearvrMouseEventsHandler = new GearVRMouseEventsHandler(); // TODO: Use when gearvr is detected
 
       const camera = document.querySelector("#player-camera");
       const registerCameraController = e => {
diff --git a/src/utils/mouse-events-handler.js b/src/utils/mouse-events-handler.js
index 3590982140f404801edba6509ed0780362c799df..52147c86c60972034bd4195412c4c22ff2ba61c9 100644
--- a/src/utils/mouse-events-handler.js
+++ b/src/utils/mouse-events-handler.js
@@ -114,6 +114,7 @@ export class MouseEventsHandler {
   }
 }
 
+//TODO: Finish gearvr mouse events handler
 export class GearVRMouseEventsHandler {
   constructor() {
     this.cursor = null;
@@ -152,7 +153,7 @@ export class GearVRMouseEventsHandler {
     document.addEventListener("mouseup", this.onMouseUp);
   }
 
-  onMouseDown(e) {
+  onMouseDown() {
     this.isMouseDownHandledByCursor = this.cursor.startInteraction();
     if (this.isMouseDownHandledByCursor) {
       return;
@@ -162,7 +163,7 @@ export class GearVRMouseEventsHandler {
     this.isMouseDownHandledByGazeTeleporter = true;
   }
 
-  onMouseUp(e) {
+  onMouseUp() {
     if (this.isMouseDownHandledByCursor) {
       this.cursor.endInteraction();
       this.isMouseDownHandledByCursor = false;
diff --git a/src/utils/touch-events-handler.js b/src/utils/touch-events-handler.js
index 24f58c5d8d089b3f62c102d944db636f7c80fbf6..2f9f4cb757fef86b3aa88cfdf293d5858ee423fd 100644
--- a/src/utils/touch-events-handler.js
+++ b/src/utils/touch-events-handler.js
@@ -1,7 +1,6 @@
 const VIRTUAL_JOYSTICK_HEIGHT = 0.8;
 const HORIZONTAL_LOOK_SPEED = 0.35;
 const VERTICAL_LOOK_SPEED = 0.18;
-const PI_4 = Math.PI / 4;
 
 //TODO: Oculus Touch controls emit touch events (wat), so we have to filter those out.
 export default class TouchEventsHandler {