diff --git a/package-lock.json b/package-lock.json
index 4688884d728cb3ecf1254ae0d3cf2de259860cbd..d34036b8666bbc53b52294a633bdc23fcf512a8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -517,9 +517,7 @@
       "requires": {
         "@tweenjs/tween.js": "^16.8.0",
         "browserify-css": "^0.8.2",
-        "debug": "github:ngokevin/debug#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a",
         "deep-assign": "^2.0.0",
-        "document-register-element": "github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90",
         "envify": "^3.4.1",
         "load-bmfont": "^1.2.3",
         "object-assign": "^4.0.1",
@@ -533,7 +531,11 @@
       "dependencies": {
         "debug": {
           "version": "github:ngokevin/debug#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a",
-          "from": "github:ngokevin/debug#noTimestamp"
+          "from": "github:ngokevin/debug#ef5f8e66d49ce8bc64c6f282c15f8b7164409e3a"
+        },
+        "document-register-element": {
+          "version": "github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90",
+          "from": "github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90"
         }
       }
     },
@@ -585,10 +587,6 @@
       "version": "github:mozillareality/aframe-teleport-controls#14f296cad85cea6d15ee5ba08b142526ff9573f4",
       "from": "github:mozillareality/aframe-teleport-controls#hubs/master"
     },
-    "aframe-xr": {
-      "version": "github:brianpeiris/aframe-xr#3162aed9f054b5a604e46a74a4f8599d4ac2ad58",
-      "from": "github:brianpeiris/aframe-xr#3162aed"
-    },
     "after": {
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
@@ -3791,10 +3789,6 @@
         "esutils": "^2.0.2"
       }
     },
-    "document-register-element": {
-      "version": "github:dmarcos/document-register-element#8ccc532b7f3744be954574caf3072a5fd260ca90",
-      "from": "github:dmarcos/document-register-element#8ccc532b7"
-    },
     "dom-converter": {
       "version": "0.1.4",
       "resolved": "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz",
diff --git a/package.json b/package.json
index 09ec5d4fae8461b61b25f679bd66933a338a92a1..631190d49cb0fdd1e75c4b566a84d91654de8ca2 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,6 @@
     "aframe-rounded": "^1.0.3",
     "aframe-slice9-component": "^1.0.0",
     "aframe-teleport-controls": "github:mozillareality/aframe-teleport-controls#hubs/master",
-    "aframe-xr": "github:brianpeiris/aframe-xr#3162aed",
     "classnames": "^2.2.5",
     "copy-to-clipboard": "^3.0.8",
     "deepmerge": "^2.1.1",
diff --git a/src/gltf-component-mappings.js b/src/gltf-component-mappings.js
index cc22ef521f2ee74281f2de9e636d867c21d89b1d..835107d15deed8178150f914ec3bd4e076aaba2e 100644
--- a/src/gltf-component-mappings.js
+++ b/src/gltf-component-mappings.js
@@ -17,7 +17,6 @@ AFRAME.GLTFModelPlus.registerComponent("point-light", "light");
 AFRAME.GLTFModelPlus.registerComponent("skybox", "skybox");
 AFRAME.GLTFModelPlus.registerComponent("layers", "layers");
 AFRAME.GLTFModelPlus.registerComponent("shadow", "shadow");
-AFRAME.GLTFModelPlus.registerComponent("xr", "xr");
 AFRAME.GLTFModelPlus.registerComponent("water", "water");
 AFRAME.GLTFModelPlus.registerComponent("scale-audio-feedback", "scale-audio-feedback");
 AFRAME.GLTFModelPlus.registerComponent("animation-mixer", "animation-mixer");
diff --git a/src/hub.js b/src/hub.js
index 3b4744abf0bd38a7361d6640aa3b5a6d878ccd5d..564462417517e2ac606c2c2a371957605230194f 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -6,8 +6,6 @@ import "aframe";
 import { patchWebGLRenderingContext } from "./utils/webgl";
 patchWebGLRenderingContext();
 
-import "aframe-xr";
-
 import "./vendor/GLTFLoader";
 import "networked-aframe/src/index";
 import "naf-janus-adapter";