diff --git a/package-lock.json b/package-lock.json
index 79700179fa..d8cfe8f08c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3279,7 +3279,7 @@
       "dev": true
     },
     "aframe": {
-      "version": "github:mozillareality/aframe#c7cedfa42ceb94b4c84b8c2e866c202263ca5f98",
+      "version": "github:mozillareality/aframe#985cecc96bb6a5880e5a8896e5fa857932ff5b09",
       "from": "github:mozillareality/aframe#hubs/master",
       "requires": {
         "animejs": "^2.2.0",
@@ -3310,47 +3310,6 @@
       "resolved": "https://registry.npmjs.org/aframe-billboard-component/-/aframe-billboard-component-2.0.0.tgz",
       "integrity": "sha512-kmtPo1wFWmsJc7RMgl4XgZyBGSgWH+q2qbYGWTHwnOforcDrVFgAY0K4xVpNc14Buvo6JK1Lzk3NiAsGleV1JA=="
     },
-    "aframe-inspector": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/aframe-inspector/-/aframe-inspector-0.8.3.tgz",
-      "integrity": "sha512-zTLfIjuG6CHhFMAQH4UaYeEeqDFLr5ZBL/2JaCvidhi+odMvJJuZqqH/uZk50bsQh2umtb929AimWvmE1edLjQ==",
-      "requires": {
-        "classnames": "^2.2.5",
-        "clipboard": "^1.5.12",
-        "invariant": "^2.2.2",
-        "lodash.debounce": "^4.0.6",
-        "prop-types": "^15.6.0",
-        "react": "^15.3.0",
-        "react-dom": "^15.3.0",
-        "react-file-reader-input": "^1.1.4",
-        "react-select": "^1.0.0-rc.1"
-      },
-      "dependencies": {
-        "react": {
-          "version": "15.6.2",
-          "resolved": "https://registry.npmjs.org/react/-/react-15.6.2.tgz",
-          "integrity": "sha1-26BDSrQ5z+gvEI8PURZjkIF5qnI=",
-          "requires": {
-            "create-react-class": "^15.6.0",
-            "fbjs": "^0.8.9",
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.0",
-            "prop-types": "^15.5.10"
-          }
-        },
-        "react-dom": {
-          "version": "15.6.2",
-          "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.6.2.tgz",
-          "integrity": "sha1-Qc+t9pO3V/rycIRDodH9WgK+9zA=",
-          "requires": {
-            "fbjs": "^0.8.9",
-            "loose-envify": "^1.1.0",
-            "object-assign": "^4.1.0",
-            "prop-types": "^15.5.10"
-          }
-        }
-      }
-    },
     "aframe-physics-system": {
       "version": "github:mozillareality/aframe-physics-system#1c5b100458bb7163e82b5661783faff494c60386",
       "from": "github:mozillareality/aframe-physics-system#hubs/ammo_driver",
diff --git a/package.json b/package.json
index 7eed15f854..63d5f38b7c 100644
--- a/package.json
+++ b/package.json
@@ -43,7 +43,6 @@
     "@fortawesome/react-fontawesome": "^0.1.0",
     "aframe": "github:mozillareality/aframe#hubs/master",
     "aframe-billboard-component": "^2.0.0",
-    "aframe-inspector": "^0.8.3",
     "aframe-physics-system": "github:mozillareality/aframe-physics-system#hubs/ammo_driver",
     "aframe-rounded": "^1.0.3",
     "aframe-slice9-component": "^1.0.0",
diff --git a/src/hub.html b/src/hub.html
index 0893188f9d..4310807b13 100644
--- a/src/hub.html
+++ b/src/hub.html
@@ -49,7 +49,6 @@
         action-to-event__mute="path: /actions/muteMic; event: action_mute;"
         freeze-controller="toggleEvent: action_freeze"
         personal-space-bubble="debug: false;"
-        vr-mode-ui="enabled: false"
         stats-plus="false"
         rotate-selected-object
         environment-map="loadDefault: false"
diff --git a/src/hub.js b/src/hub.js
index 7a3757b67e..cdfd97f6b7 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -536,7 +536,6 @@ document.addEventListener("DOMContentLoaded", async () => {
   }
 
   const scene = document.querySelector("a-scene");
-  scene.removeAttribute("keyboard-shortcuts"); // Remove F and ESC hotkeys from aframe
   scene.setAttribute("shadow", { enabled: window.APP.quality !== "low" }); // Disable shadows on low quality
 
   // Physics needs to be ready before spawning anything.
diff --git a/src/react-components/avatar-selector.js b/src/react-components/avatar-selector.js
index 737a833485..bf4cb42e69 100644
--- a/src/react-components/avatar-selector.js
+++ b/src/react-components/avatar-selector.js
@@ -154,7 +154,6 @@ class AvatarSelector extends Component {
     return (
       <div className="avatar-selector">
         <a-scene
-          vr-mode-ui="enabled: false"
           ref={sce => (this.scene = sce)}
           background="color: #aaa"
           environment-map=""
diff --git a/src/scene-entry-manager.js b/src/scene-entry-manager.js
index 84d6fd4ed9..52287c5bba 100644
--- a/src/scene-entry-manager.js
+++ b/src/scene-entry-manager.js
@@ -7,7 +7,6 @@ const isBotMode = qsTruthy("bot");
 const isMobile = AFRAME.utils.device.isMobile();
 const isDebug = qsTruthy("debug");
 const qs = new URLSearchParams(location.search);
-const aframeInspectorUrl = require("file-loader?name=assets/js/[name]-[hash].[ext]!aframe-inspector/dist/aframe-inspector.min.js");
 
 import { addMedia, getPromotionTokenForFile } from "./utils/media-utils";
 import {
@@ -52,10 +51,6 @@ export default class SceneEntryManager {
     playerCamera.removeAttribute("scene-preview-camera");
     playerCamera.object3D.position.set(0, playerHeight, 0);
 
-    // Get aframe inspector url using the webpack file-loader.
-    // Set the aframe-inspector url to our hosted copy.
-    this.scene.setAttribute("inspector", { url: aframeInspectorUrl });
-
     if (isDebug) {
       NAF.connection.adapter.session.options.verbose = true;
     }
diff --git a/src/scene.html b/src/scene.html
index d4c837f216..58084cb5da 100644
--- a/src/scene.html
+++ b/src/scene.html
@@ -41,7 +41,6 @@
         loading-screen="enabled: false"
         renderer="antialias: true; gammaOutput: true; sortObjects: true; physicallyCorrectLights: true; colorManagement: true; alpha: false;"
         shadow="type: pcfsoft"
-        vr-mode-ui="enabled: false"
         environment-map="loadDefault: false"
     >
         <a-entity