diff --git a/src/components/activitylog.js b/src/components/activitylog.js
index 623998a40..983425500 100644
--- a/src/components/activitylog.js
+++ b/src/components/activitylog.js
@@ -3,7 +3,6 @@ import globalize from 'globalize';
 import dom from 'dom';
 import * as datefns from 'date-fns';
 import dfnshelper from 'dfnshelper';
-import userSettings from 'userSettings';
 import serverNotifications from 'serverNotifications';
 import connectionManager from 'connectionManager';
 import 'emby-button';
diff --git a/src/components/appFooter/appFooter.js b/src/components/appFooter/appFooter.js
index af50ef7bf..c60aa1a27 100644
--- a/src/components/appFooter/appFooter.js
+++ b/src/components/appFooter/appFooter.js
@@ -1,4 +1,3 @@
-import browser from 'browser';
 import 'css!./appFooter';
 
 function render(options) {
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index a6d0b1066..4c64c5e06 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -1163,6 +1163,7 @@ import 'programStyles';
         function importRefreshIndicator() {
             if (!refreshIndicatorLoaded) {
                 refreshIndicatorLoaded = true;
+                /* eslint-disable-next-line no-unused-expressions */
                 import('emby-itemrefreshindicator');
             }
         }
@@ -1498,6 +1499,7 @@ import 'programStyles';
             const userData = item.UserData || {};
 
             if (itemHelper.canMarkPlayed(item)) {
+                /* eslint-disable-next-line no-unused-expressions */
                 import('emby-playstatebutton');
                 html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></button>';
             }
@@ -1506,6 +1508,7 @@ import 'programStyles';
 
                 const likes = userData.Likes == null ? '' : userData.Likes;
 
+                /* eslint-disable-next-line no-unused-expressions */
                 import('emby-ratingbutton');
                 html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></button>';
             }
diff --git a/src/components/collectionEditor/collectionEditor.js b/src/components/collectionEditor/collectionEditor.js
index 17d8a6145..70e2083cd 100644
--- a/src/components/collectionEditor/collectionEditor.js
+++ b/src/components/collectionEditor/collectionEditor.js
@@ -1,7 +1,6 @@
 import dom from 'dom';
 import dialogHelper from 'dialogHelper';
 import loading from 'loading';
-import appHost from 'apphost';
 import layoutManager from 'layoutManager';
 import connectionManager from 'connectionManager';
 import appRouter from 'appRouter';
diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js
index 7c89f7aea..f1a4afcb1 100644
--- a/src/components/itemContextMenu.js
+++ b/src/components/itemContextMenu.js
@@ -4,8 +4,6 @@ import connectionManager from 'connectionManager';
 import itemHelper from 'itemHelper';
 import appRouter from 'appRouter';
 import playbackManager from 'playbackManager';
-import loading from 'loading';
-import appSettings from 'appSettings';
 import browser from 'browser';
 import actionsheet from 'actionsheet';
 
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 9bf2da200..ac01b8c55 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -1,4 +1,3 @@
-import itemHelper from 'itemHelper';
 import dom from 'dom';
 import layoutManager from 'layoutManager';
 import dialogHelper from 'dialogHelper';
diff --git a/src/components/metadataEditor/personEditor.js b/src/components/metadataEditor/personEditor.js
index 2349f40e7..18fb31792 100644
--- a/src/components/metadataEditor/personEditor.js
+++ b/src/components/metadataEditor/personEditor.js
@@ -1,7 +1,6 @@
 import dialogHelper from 'dialogHelper';
 import layoutManager from 'layoutManager';
 import globalize from 'globalize';
-import require from 'require';
 import 'paper-icon-button-light';
 import 'emby-input';
 import 'emby-select';
diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index ed4613129..6b69d066f 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -1,6 +1,4 @@
-import require from 'require';
 import datetime from 'datetime';
-import itemHelper from 'itemHelper';
 import events from 'events';
 import browser from 'browser';
 import imageLoader from 'imageLoader';
diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
index 2aac91f0d..b68018769 100644
--- a/src/components/playerstats/playerstats.js
+++ b/src/components/playerstats/playerstats.js
@@ -5,7 +5,6 @@ import connectionManager from 'connectionManager';
 import syncPlayManager from 'syncPlayManager';
 import playMethodHelper from 'playMethodHelper';
 import layoutManager from 'layoutManager';
-import serverNotifications from 'serverNotifications';
 import 'paper-icon-button-light';
 import 'css!./playerstats';
 
diff --git a/src/components/search/searchresults.js b/src/components/search/searchresults.js
index e16b6a1cd..87fbad3a1 100644
--- a/src/components/search/searchresults.js
+++ b/src/components/search/searchresults.js
@@ -1,7 +1,5 @@
 import layoutManager from 'layoutManager';
 import globalize from 'globalize';
-import require from 'require';
-import events from 'events';
 import connectionManager from 'connectionManager';
 import cardBuilder from 'cardBuilder';
 import appRouter from 'appRouter';
diff --git a/src/components/subtitlesettings/subtitlesettings.js b/src/components/subtitlesettings/subtitlesettings.js
index d2ae852bd..4bb4a364e 100644
--- a/src/components/subtitlesettings/subtitlesettings.js
+++ b/src/components/subtitlesettings/subtitlesettings.js
@@ -1,4 +1,3 @@
-import require from 'require';
 import globalize from 'globalize';
 import appHost from 'apphost';
 import appSettings from 'appSettings';
diff --git a/src/controllers/auth/addserver.js b/src/controllers/auth/addserver.js
index 112928324..7d3ba7f47 100644
--- a/src/controllers/auth/addserver.js
+++ b/src/controllers/auth/addserver.js
@@ -1,6 +1,5 @@
 import appSettings from 'appSettings';
 import loading from 'loading';
-import browser from 'browser';
 import globalize from 'globalize';
 import 'emby-button';
 
diff --git a/src/controllers/dashboard/apikeys.js b/src/controllers/dashboard/apikeys.js
index 0e122c486..2b526aa8c 100644
--- a/src/controllers/dashboard/apikeys.js
+++ b/src/controllers/dashboard/apikeys.js
@@ -1,6 +1,5 @@
 import datetime from 'datetime';
 import loading from 'loading';
-import libraryMenu from 'libraryMenu';
 import dom from 'dom';
 import globalize from 'globalize';
 import 'emby-button';
diff --git a/src/controllers/dashboard/devices/device.js b/src/controllers/dashboard/devices/device.js
index 7faaee249..17e28b9bd 100644
--- a/src/controllers/dashboard/devices/device.js
+++ b/src/controllers/dashboard/devices/device.js
@@ -1,5 +1,4 @@
 import loading from 'loading';
-import libraryMenu from 'libraryMenu';
 import dom from 'dom';
 import 'emby-input';
 import 'emby-button';
diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
index 9f05d8471..93ae62c43 100644
--- a/src/controllers/dashboard/devices/devices.js
+++ b/src/controllers/dashboard/devices/devices.js
@@ -1,6 +1,5 @@
 import loading from 'loading';
 import dom from 'dom';
-import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
 import imageHelper from 'scripts/imagehelper';
 import * as datefns from 'date-fns';
diff --git a/src/controllers/dashboard/mediaLibrary.js b/src/controllers/dashboard/mediaLibrary.js
index b958e69d2..e49efb099 100644
--- a/src/controllers/dashboard/mediaLibrary.js
+++ b/src/controllers/dashboard/mediaLibrary.js
@@ -1,11 +1,9 @@
 import $ from 'jQuery';
-import appHost from 'apphost';
 import taskButton from 'scripts/taskbutton';
 import loading from 'loading';
 import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
 import dom from 'dom';
-import indicators from 'indicators';
 import imageHelper from 'scripts/imagehelper';
 import 'cardStyle';
 import 'emby-itemrefreshindicator';
diff --git a/src/controllers/dashboard/metadataImages.js b/src/controllers/dashboard/metadataImages.js
index cbfe05419..02e01736e 100644
--- a/src/controllers/dashboard/metadataImages.js
+++ b/src/controllers/dashboard/metadataImages.js
@@ -1,5 +1,4 @@
 import $ from 'jQuery';
-import dom from 'dom';
 import loading from 'loading';
 import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
diff --git a/src/controllers/dashboard/networking.js b/src/controllers/dashboard/networking.js
index 367ab8335..5cae08d2f 100644
--- a/src/controllers/dashboard/networking.js
+++ b/src/controllers/dashboard/networking.js
@@ -1,5 +1,4 @@
 import loading from 'loading';
-import libraryMenu from 'libraryMenu';
 import globalize from 'globalize';
 import 'emby-checkbox';
 import 'emby-select';
diff --git a/src/controllers/searchpage.js b/src/controllers/searchpage.js
index 8ce3e8afe..ffb7fbac0 100644
--- a/src/controllers/searchpage.js
+++ b/src/controllers/searchpage.js
@@ -1,4 +1,3 @@
-import focusManager from 'focusManager';
 import SearchFields from 'searchFields';
 import SearchResults from 'searchResults';
 import events from 'events';
diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js
index 52906fb77..87d3a2e24 100644
--- a/src/controllers/shows/tvgenres.js
+++ b/src/controllers/shows/tvgenres.js
@@ -3,10 +3,8 @@ import loading from 'loading';
 import libraryBrowser from 'libraryBrowser';
 import cardBuilder from 'cardBuilder';
 import lazyLoader from 'lazyLoader';
-import appHost from 'apphost';
 import globalize from 'globalize';
 import appRouter from 'appRouter';
-import dom from 'dom';
 import 'emby-button';
 
 /* eslint-disable indent */
diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js
index cde5ae505..1ee70c8f8 100644
--- a/src/controllers/shows/tvshows.js
+++ b/src/controllers/shows/tvshows.js
@@ -1,4 +1,3 @@
-import layoutManager from 'layoutManager';
 import loading from 'loading';
 import events from 'events';
 import libraryBrowser from 'libraryBrowser';
diff --git a/src/controllers/shows/tvstudios.js b/src/controllers/shows/tvstudios.js
index ba7fdfaf7..4be717fb7 100644
--- a/src/controllers/shows/tvstudios.js
+++ b/src/controllers/shows/tvstudios.js
@@ -1,7 +1,6 @@
 import loading from 'loading';
 import libraryBrowser from 'libraryBrowser';
 import cardBuilder from 'cardBuilder';
-import appHost from 'apphost';
 
 /* eslint-disable indent */
 
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu.js
index ef4b3b21c..f44a193a5 100644
--- a/src/controllers/user/menu.js
+++ b/src/controllers/user/menu.js
@@ -1,6 +1,4 @@
 import appHost from 'apphost';
-import connectionManager from 'connectionManager';
-import layoutManager from 'layoutManager';
 import 'listViewStyle';
 import 'emby-button';
 
diff --git a/src/plugins/htmlVideoPlayer/plugin.js b/src/plugins/htmlVideoPlayer/plugin.js
index 1558ffe36..b1856afbd 100644
--- a/src/plugins/htmlVideoPlayer/plugin.js
+++ b/src/plugins/htmlVideoPlayer/plugin.js
@@ -1,7 +1,6 @@
 
 define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackManager', 'appRouter', 'appSettings', 'connectionManager', 'htmlMediaHelper', 'itemHelper', 'screenfull', 'globalize'], function (browser, require, events, appHost, loading, dom, playbackManager, appRouter, appSettings, connectionManager, htmlMediaHelper, itemHelper, screenfull, globalize) {
     'use strict';
-    /* globals cast */
 
     function tryRemoveElement(elem) {
         var parentNode = elem.parentNode;
diff --git a/src/plugins/youtubePlayer/plugin.js b/src/plugins/youtubePlayer/plugin.js
index fc7c33f87..f12401f8e 100644
--- a/src/plugins/youtubePlayer/plugin.js
+++ b/src/plugins/youtubePlayer/plugin.js
@@ -1,4 +1,3 @@
-import require from 'require';
 import events from 'events';
 import browser from 'browser';
 import appRouter from 'appRouter';
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index 5d0e237a0..248933596 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -1,4 +1,3 @@
-import datetime from 'datetime';
 import $ from 'jQuery';
 import globalize from 'globalize';
 import 'material-icons';
@@ -303,6 +302,7 @@ import 'material-icons';
     $(document).on('itemsaved', '.metadataEditorPage', function (e, item) {
         updateEditorNode(this, item);
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
+        /* eslint-disable-next-line no-unused-expressions */
         import('css!assets/css/metadataeditor.css');
     }).on('pagebeforeshow', '.metadataEditorPage', function () {
         var page = this;
diff --git a/src/scripts/keyboardNavigation.js b/src/scripts/keyboardNavigation.js
index 7cc4df955..10a9611c3 100644
--- a/src/scripts/keyboardNavigation.js
+++ b/src/scripts/keyboardNavigation.js
@@ -155,6 +155,7 @@ export function enable() {
 function attachGamepadScript(e) {
     console.log('Gamepad connected! Attaching gamepadtokey.js script');
     window.removeEventListener('gamepadconnected', attachGamepadScript);
+    /* eslint-disable-next-line no-unused-expressions */
     import('scripts/gamepadtokey');
 }
 
diff --git a/src/scripts/playlists.js b/src/scripts/playlists.js
index 6944660f0..123d1c785 100644
--- a/src/scripts/playlists.js
+++ b/src/scripts/playlists.js
@@ -3,7 +3,6 @@ import listView from 'listView';
 import cardBuilder from 'cardBuilder';
 import libraryMenu from 'libraryMenu';
 import libraryBrowser from 'libraryBrowser';
-import appHost from 'apphost';
 import imageLoader from 'imageLoader';
 import userSettings from 'userSettings';
 import 'emby-itemscontainer';
diff --git a/src/scripts/taskbutton.js b/src/scripts/taskbutton.js
index 85062fdaa..6df7ee848 100644
--- a/src/scripts/taskbutton.js
+++ b/src/scripts/taskbutton.js
@@ -1,5 +1,5 @@
+
 import events from 'events';
-import * as userSettings from 'userSettings';
 import serverNotifications from 'serverNotifications';
 import connectionManager from 'connectionManager';
 import globalize from 'globalize';