diff --git a/src/avatar-selector.js b/src/avatar-selector.js
index 6acfe154caebb1c9f799631940aeb918e945fd7e..ea3ff71a0f1f225cb9ae9f68a813167125bc3207 100644
--- a/src/avatar-selector.js
+++ b/src/avatar-selector.js
@@ -1,7 +1,7 @@
 import ReactDOM from "react-dom";
 import React from "react";
 import queryString from "query-string";
-import { IntlProvider, FormattedMessage, addLocaleData } from "react-intl";
+import { IntlProvider, addLocaleData } from "react-intl";
 import en from "react-intl/locale-data/en";
 
 import "./assets/stylesheets/avatar-selector.scss";
@@ -12,13 +12,15 @@ import "./components/audio-feedback";
 import "./components/loop-animation";
 import "./elements/a-progressive-asset";
 import "./gltf-component-mappings";
-import { avatars } from "./assets/avatars/avatars.js";
-import { avatarIds } from "./utils/identity";
+import { avatars } from "./assets/avatars/avatars";
 
+import registerTelemetry from "./telemetry";
 import { App } from "./App";
 import AvatarSelector from "./react-components/avatar-selector";
 import localeData from "./assets/translations.data.json";
 
+registerTelemetry();
+
 window.APP = new App();
 const hash = queryString.parse(location.hash);
 const isMobile = AFRAME.utils.device.isMobile();
diff --git a/src/hub.js b/src/hub.js
index 5ed6373c2f08fa2316f3e18a2d08c23e5874828e..a99ba8b0df4e9d310333c63416e34d73b7343f7b 100644
--- a/src/hub.js
+++ b/src/hub.js
@@ -220,6 +220,8 @@ function mountUI(scene) {
   const forcedVREntryType = qs.vr_entry_type || null;
   const enableScreenSharing = qsTruthy("enable_screen_sharing");
 
+  // TODO: Refactor to avoid using return value
+  /* eslint-disable react/no-render-return-value */
   const uiRoot = ReactDOM.render(
     <UIRoot
       {...{
@@ -235,6 +237,7 @@ function mountUI(scene) {
     />,
     document.getElementById("ui-root")
   );
+  /* eslint-enable react/no-render-return-value */
 
   return uiRoot;
 }
diff --git a/src/index.js b/src/index.js
index 2518b42dd56390078e56b04220ed780ab6abe707..198ee8d47378bd740fc9a2891cc6945447442b2a 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,4 +4,5 @@ import ReactDOM from "react-dom";
 import HomeRoot from "./react-components/home-root";
 import registerTelemetry from "./telemetry";
 
+registerTelemetry();
 ReactDOM.render(<HomeRoot />, document.getElementById("home-root"));