diff --git a/src/components/hand-tracking-controls.js b/src/components/hand-tracking-controls.js
index 81ba056b863..65c8de755d4 100644
--- a/src/components/hand-tracking-controls.js
+++ b/src/components/hand-tracking-controls.js
@@ -149,7 +149,7 @@ export var Component = registerComponent('hand-tracking-controls', {
     xrSession.requestReferenceSpace(referenceSpaceType).then(function (referenceSpace) {
       self.referenceSpace = referenceSpace;
     }).catch(function (error) {
-      self.el.sceneEl.systems.webxr.warnIfFeatureNotRequested(referenceSpaceType, 'tracked-controls-webxr uses reference space ' + referenceSpaceType);
+      self.el.sceneEl.systems.webxr.warnIfFeatureNotRequested(referenceSpaceType, 'tracked-controls uses reference space ' + referenceSpaceType);
       throw error;
     });
   },
diff --git a/src/components/tracked-controls.js b/src/components/tracked-controls.js
index 0f5761ee91f..934245ba208 100644
--- a/src/components/tracked-controls.js
+++ b/src/components/tracked-controls.js
@@ -36,8 +36,8 @@ export var Component = registerComponent('tracked-controls', {
 
   init: function () {
     this.buttonEventDetails = {};
-    this.buttonStates = this.el.components['tracked-controls'].buttonStates = {};
-    this.axis = this.el.components['tracked-controls'].axis = [0, 0, 0];
+    this.buttonStates = {};
+    this.axis = [0, 0, 0];
     this.changedAxes = [];
     this.axisMoveEventDetail = {axis: this.axis, changed: this.changedAxes};
 
@@ -80,8 +80,6 @@ export var Component = registerComponent('tracked-controls', {
       this.data.iterateControllerProfiles,
       this.data.handTrackingEnabled
     );
-    // Legacy handle to the controller for old components.
-    this.el.components['tracked-controls'].controller = this.controller;
   },
 
   tick: function () {