diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index eb21d9655..ecd47bffd 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const Pango = imports.gi.Pango;
 const Signals = imports.signals;
 const St = imports.gi.St;
diff --git a/js/gdm/fingerprint.js b/js/gdm/fingerprint.js
index a290e21c1..5bf2becd5 100644
--- a/js/gdm/fingerprint.js
+++ b/js/gdm/fingerprint.js
@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 
 const FprintManagerIface = `
 <node>
diff --git a/js/gdm/realmd.js b/js/gdm/realmd.js
index 94007aa49..50f3c5899 100644
--- a/js/gdm/realmd.js
+++ b/js/gdm/realmd.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 63376873e..6599b7f7d 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -3,16 +3,13 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Mainloop = imports.mainloop;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const Batch = imports.gdm.batch;
 const Fprint = imports.gdm.fingerprint;
 const OVirt = imports.gdm.oVirt;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
-const ShellEntry = imports.ui.shellEntry;
 const SmartcardManager = imports.misc.smartcardManager;
 const Tweener = imports.ui.tweener;
 
diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js
index ce615d54c..a2281a9b6 100644
--- a/js/misc/fileUtils.js
+++ b/js/misc/fileUtils.js
@@ -3,7 +3,6 @@
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Config = imports.misc.config;
-const Params = imports.misc.params;
 
 function collectFromDatadirs(subdir, includeUserDir, processFile) {
     let dataDirs = GLib.get_system_data_dirs();
diff --git a/js/misc/gnomeSession.js b/js/misc/gnomeSession.js
index af14d641c..89b860d72 100644
--- a/js/misc/gnomeSession.js
+++ b/js/misc/gnomeSession.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
-const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js
index 4788a6d9e..bd239e556 100644
--- a/js/misc/inputMethod.js
+++ b/js/misc/inputMethod.js
@@ -3,7 +3,6 @@ const Clutter = imports.gi.Clutter;
 const GObject = imports.gi.GObject;
 const IBus = imports.gi.IBus;
 const Keyboard = imports.ui.status.keyboard;
-const Signals = imports.signals;
 
 var InputMethod = GObject.registerClass(
 class InputMethod extends Clutter.InputMethod {
diff --git a/js/misc/loginManager.js b/js/misc/loginManager.js
index 139129b60..30b0e7bd7 100644
--- a/js/misc/loginManager.js
+++ b/js/misc/loginManager.js
@@ -2,8 +2,6 @@
 
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
-const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
diff --git a/js/misc/smartcardManager.js b/js/misc/smartcardManager.js
index b67f9a785..fda782d1e 100644
--- a/js/misc/smartcardManager.js
+++ b/js/misc/smartcardManager.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Gio = imports.gi.Gio;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
 const ObjectManager = imports.misc.objectManager;
diff --git a/js/perf/hwtest.js b/js/perf/hwtest.js
index cce996671..86e3d6f70 100644
--- a/js/perf/hwtest.js
+++ b/js/perf/hwtest.js
@@ -1,7 +1,6 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
-const Meta = imports.gi.Meta;
 const Main = imports.ui.main;
 const Scripting = imports.ui.scripting;
 const Shell = imports.gi.Shell;
diff --git a/js/ui/accessDialog.js b/js/ui/accessDialog.js
index c6a5a1882..59a0495aa 100644
--- a/js/ui/accessDialog.js
+++ b/js/ui/accessDialog.js
@@ -1,9 +1,7 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const CheckBox = imports.ui.checkBox;
 const Dialog = imports.ui.dialog;
diff --git a/js/ui/animation.js b/js/ui/animation.js
index 12e2ab282..96d33c96f 100644
--- a/js/ui/animation.js
+++ b/js/ui/animation.js
@@ -4,8 +4,6 @@ const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;
 const St = imports.gi.St;
-const Signals = imports.signals;
-const Atk = imports.gi.Atk;
 
 const Tweener = imports.ui.tweener;
 
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 23ec4df70..4494a6b69 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -9,7 +9,6 @@ const Signals = imports.signals;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Mainloop = imports.mainloop;
-const Atk = imports.gi.Atk;
 
 const AppFavorites = imports.ui.appFavorites;
 const BoxPointer = imports.ui.boxpointer;
@@ -17,14 +16,10 @@ const DND = imports.ui.dnd;
 const GrabHelper = imports.ui.grabHelper;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const Overview = imports.ui.overview;
-const OverviewControls = imports.ui.overviewControls;
 const PageIndicators = imports.ui.pageIndicators;
 const PopupMenu = imports.ui.popupMenu;
 const Tweener = imports.ui.tweener;
-const Workspace = imports.ui.workspace;
 const Search = imports.ui.search;
-const System = imports.ui.status.system;
 const Params = imports.misc.params;
 const Util = imports.misc.util;
 const SystemActions = imports.misc.systemActions;
diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
index 352c7d31a..69886ed51 100644
--- a/js/ui/backgroundMenu.js
+++ b/js/ui/backgroundMenu.js
@@ -2,7 +2,6 @@
 
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const BoxPointer = imports.ui.boxpointer;
 const Main = imports.ui.main;
diff --git a/js/ui/barLevel.js b/js/ui/barLevel.js
index 6b0e72464..0c32ee5a8 100644
--- a/js/ui/barLevel.js
+++ b/js/ui/barLevel.js
@@ -1,7 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Atk = imports.gi.Atk;
-const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Signals = imports.signals;
diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 2abaa8246..35d191342 100644
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const GObject = imports.gi.GObject;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
diff --git a/js/ui/components/automountManager.js b/js/ui/components/automountManager.js
index 9903a48f5..1bfadd2ca 100644
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -4,10 +4,8 @@ const Mainloop = imports.mainloop;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Params = imports.misc.params;
-const Shell = imports.gi.Shell;
 
 const GnomeSession = imports.misc.gnomeSession;
-const Main = imports.ui.main;
 const ShellMountOperation = imports.ui.shellMountOperation;
 
 var GNOME_SESSION_AUTOMOUNT_INHIBIT = 16;
diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js
index 22ea5d25b..4801e3d90 100644
--- a/js/ui/components/keyring.js
+++ b/js/ui/components/keyring.js
@@ -13,7 +13,6 @@ const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const CheckBox = imports.ui.checkBox;
-const Tweener = imports.ui.tweener;
 
 var WORK_SPINNER_ICON_SIZE = 16;
 
diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js
index 0dad547dd..9bc9037a5 100644
--- a/js/ui/components/networkAgent.js
+++ b/js/ui/components/networkAgent.js
@@ -3,7 +3,6 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const GObject = imports.gi.GObject;
 const NM = imports.gi.NM;
 const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
@@ -15,7 +14,6 @@ const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const ModalDialog = imports.ui.modalDialog;
-const PopupMenu = imports.ui.popupMenu;
 const ShellEntry = imports.ui.shellEntry;
 
 const VPN_UI_GROUP = 'VPN Plugin UI';
diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js
index 3e5090fb1..cf5759112 100644
--- a/js/ui/components/polkitAgent.js
+++ b/js/ui/components/polkitAgent.js
@@ -8,18 +8,15 @@ const St = imports.gi.St;
 const Pango = imports.gi.Pango;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
-const Mainloop = imports.mainloop;
 const Polkit = imports.gi.Polkit;
 const PolkitAgent = imports.gi.PolkitAgent;
 
 const Animation = imports.ui.animation;
-const Components = imports.ui.components;
 const Dialog = imports.ui.dialog;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
 const UserWidget = imports.ui.userWidget;
-const Tweener = imports.ui.tweener;
 
 var DIALOG_ICON_SIZE = 48;
 
diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js
index 86e40b4e7..d7221b168 100644
--- a/js/ui/components/telepathyClient.js
+++ b/js/ui/components/telepathyClient.js
@@ -6,7 +6,6 @@ const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 var Tpl = null;
@@ -23,7 +22,6 @@ const Main = imports.ui.main;
 const MessageList = imports.ui.messageList;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
-const PopupMenu = imports.ui.popupMenu;
 const Util = imports.misc.util;
 
 const HAVE_TP = (Tp != null && Tpl != null);
diff --git a/js/ui/ctrlAltTab.js b/js/ui/ctrlAltTab.js
index e66e663ff..302aaeda5 100644
--- a/js/ui/ctrlAltTab.js
+++ b/js/ui/ctrlAltTab.js
@@ -8,7 +8,6 @@ const St = imports.gi.St;
 const Main = imports.ui.main;
 const SwitcherPopup = imports.ui.switcherPopup;
 const Params = imports.misc.params;
-const Tweener = imports.ui.tweener;
 
 var POPUP_APPICON_SIZE = 96;
 var POPUP_FADE_TIME = 0.1; // seconds
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 74e0aca87..921b1d783 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Signals = imports.signals;
@@ -16,7 +15,6 @@ const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
-const Workspace = imports.ui.workspace;
 
 var DASH_ANIMATION_TIME = 0.2;
 var DASH_ITEM_LABEL_SHOW_TIME = 0.15;
diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js
index 8f961d7f3..9e21bd232 100644
--- a/js/ui/dateMenu.js
+++ b/js/ui/dateMenu.js
@@ -1,23 +1,16 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 const GnomeDesktop = imports.gi.GnomeDesktop;
 const GObject = imports.gi.GObject;
 const GWeather = imports.gi.GWeather;
-const Mainloop = imports.mainloop;
-const Pango = imports.gi.Pango;
-const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
-const Params = imports.misc.params;
 const Util = imports.misc.util;
 const Main = imports.ui.main;
 const PanelMenu = imports.ui.panelMenu;
-const PopupMenu = imports.ui.popupMenu;
 const Calendar = imports.ui.calendar;
 const Weather = imports.misc.weather;
 const System = imports.system;
diff --git a/js/ui/edgeDragAction.js b/js/ui/edgeDragAction.js
index 0cad5da34..007921d89 100644
--- a/js/ui/edgeDragAction.js
+++ b/js/ui/edgeDragAction.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const GObject = imports.gi.GObject;
-const Signals = imports.signals;
 const Meta = imports.gi.Meta;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 1d6efc5ec..bab712e27 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -31,7 +31,6 @@ const CheckBox = imports.ui.checkBox;
 const GnomeSession = imports.misc.gnomeSession;
 const LoginManager = imports.misc.loginManager;
 const ModalDialog = imports.ui.modalDialog;
-const Tweener = imports.ui.tweener;
 const UserWidget = imports.ui.userWidget;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
diff --git a/js/ui/environment.js b/js/ui/environment.js
index 03698e55b..7c239408b 100644
--- a/js/ui/environment.js
+++ b/js/ui/environment.js
@@ -12,7 +12,6 @@ imports.gi.versions.TelepathyLogger = '0.2';
 const Clutter = imports.gi.Clutter;
 const Gettext = imports.gettext;
 const GLib = imports.gi.GLib;
-const Gtk = imports.gi.Gtk;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 828f6f789..642be51ee 100644
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -5,7 +5,6 @@ const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Soup = imports.gi.Soup;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Config = imports.misc.config;
 const ExtensionUtils = imports.misc.extensionUtils;
diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 85664bfea..18c046cc5 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -2,7 +2,6 @@
 
 const Signals = imports.signals;
 
-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
 
diff --git a/js/ui/grabHelper.js b/js/ui/grabHelper.js
index a47b18a33..55e82a829 100644
--- a/js/ui/grabHelper.js
+++ b/js/ui/grabHelper.js
@@ -1,8 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js
index 9e1eb2ac8..cd91e0c62 100644
--- a/js/ui/iconGrid.js
+++ b/js/ui/iconGrid.js
@@ -3,8 +3,6 @@
 const Clutter = imports.gi.Clutter;
 const GObject = imports.gi.GObject;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const Params = imports.misc.params;
diff --git a/js/ui/inhibitShortcutsDialog.js b/js/ui/inhibitShortcutsDialog.js
index 16c96400d..dc1d5a319 100644
--- a/js/ui/inhibitShortcutsDialog.js
+++ b/js/ui/inhibitShortcutsDialog.js
@@ -4,7 +4,6 @@ const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const St = imports.gi.St;
 
 const Dialog = imports.ui.dialog;
 const ModalDialog = imports.ui.modalDialog;
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index 587d9c0e7..cc42e1c8a 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -1,12 +1,10 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Atspi = imports.gi.Atspi;
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const InputSourceManager = imports.ui.status.keyboard;
@@ -18,7 +16,6 @@ const Main = imports.ui.main;
 const PageIndicators = imports.ui.pageIndicators;
 const PopupMenu = imports.ui.popupMenu;
 const Tweener = imports.ui.tweener;
-const Util = imports.misc.util;
 
 var KEYBOARD_REST_TIME = Layout.KEYBOARD_ANIMATION_TIME * 2 * 1000;
 var KEY_LONG_PRESS_TIME = 250;
diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index 920f1d3a0..7a702883a 100644
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -2,7 +2,6 @@
 
 const Clutter = imports.gi.Clutter;
 const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
diff --git a/js/ui/main.js b/js/ui/main.js
index ccecb49d4..5d5b9dfc6 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -13,7 +13,6 @@ const AudioDeviceSelection = imports.ui.audioDeviceSelection;
 const Components = imports.ui.components;
 const CtrlAltTab = imports.ui.ctrlAltTab;
 const EndSessionDialog = imports.ui.endSessionDialog;
-const Environment = imports.ui.environment;
 const ExtensionSystem = imports.ui.extensionSystem;
 const ExtensionDownloader = imports.ui.extensionDownloader;
 const InputMethod = imports.misc.inputMethod;
@@ -42,7 +41,6 @@ const ShellMountOperation = imports.ui.shellMountOperation;
 const WindowManager = imports.ui.windowManager;
 const Magnifier = imports.ui.magnifier;
 const XdndHandler = imports.ui.xdndHandler;
-const Util = imports.misc.util;
 const KbdA11yDialog = imports.ui.kbdA11yDialog;
 
 const A11Y_SCHEMA = 'org.gnome.desktop.a11y.keyboard';
diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index a85ee577c..43b787790 100644
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -4,10 +4,8 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
-const Atk = imports.gi.Atk;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
@@ -18,7 +16,6 @@ const Layout = imports.ui.layout;
 const Main = imports.ui.main;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
-const Util = imports.misc.util;
 
 const SHELL_KEYBINDINGS_SCHEMA = 'org.gnome.shell.keybindings';
 
diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js
index 739de2d5e..b9cc11a8c 100644
--- a/js/ui/modalDialog.js
+++ b/js/ui/modalDialog.js
@@ -1,10 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index 4180609bd..df53962f9 100644
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
 const GdkPixbuf = imports.gi.GdkPixbuf;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
@@ -12,7 +11,6 @@ const Config = imports.misc.config;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const Params = imports.misc.params;
-const Util = imports.misc.util;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
diff --git a/js/ui/osdMonitorLabeler.js b/js/ui/osdMonitorLabeler.js
index cdb6e7627..3c8d49318 100644
--- a/js/ui/osdMonitorLabeler.js
+++ b/js/ui/osdMonitorLabeler.js
@@ -5,7 +5,6 @@ const Gio = imports.gi.Gio;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
-const Tweener = imports.ui.tweener;
 const Meta = imports.gi.Meta;
 
 var FADE_TIME = 0.1;
diff --git a/js/ui/overview.js b/js/ui/overview.js
index e92b21e50..fc8b3671e 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -15,7 +15,6 @@ const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const MessageTray = imports.ui.messageTray;
 const OverviewControls = imports.ui.overviewControls;
-const Panel = imports.ui.panel;
 const Params = imports.misc.params;
 const Tweener = imports.ui.tweener;
 const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js
index 3cf354423..129eb5166 100644
--- a/js/ui/overviewControls.js
+++ b/js/ui/overviewControls.js
@@ -4,7 +4,6 @@ const GObject = imports.gi.GObject;
 const Clutter = imports.gi.Clutter;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const Dash = imports.ui.dash;
 const Main = imports.ui.main;
diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js
index 2cc449d9f..101531295 100644
--- a/js/ui/padOsd.js
+++ b/js/ui/padOsd.js
@@ -1,7 +1,6 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Clutter = imports.gi.Clutter;
 const St = imports.gi.St;
 const Rsvg = imports.gi.Rsvg;
@@ -11,7 +10,6 @@ const Gtk = imports.gi.Gtk;
 const Gio = imports.gi.Gio;
 const GDesktopEnums = imports.gi.GDesktopEnums;
 const Atk = imports.gi.Atk;
-const Cairo = imports.cairo;
 const Signals = imports.signals;
 
 const Main = imports.ui.main;
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 1a8d88131..6026c8a9e 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -8,10 +8,8 @@ const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Signals = imports.signals;
 const Atk = imports.gi.Atk;
 
 const Animation = imports.ui.animation;
diff --git a/js/ui/panelMenu.js b/js/ui/panelMenu.js
index 72fcae4c1..9cdbb1066 100644
--- a/js/ui/panelMenu.js
+++ b/js/ui/panelMenu.js
@@ -1,9 +1,7 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const Atk = imports.gi.Atk;
diff --git a/js/ui/pointerWatcher.js b/js/ui/pointerWatcher.js
index 26bb28527..8bc5771b7 100644
--- a/js/ui/pointerWatcher.js
+++ b/js/ui/pointerWatcher.js
@@ -3,8 +3,6 @@
 const GLib = imports.gi.GLib;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const GnomeDesktop = imports.gi.GnomeDesktop;
-const Shell = imports.gi.Shell;
 
 // We stop polling if the user is idle for more than this amount of time
 var IDLE_TIME = 1000;
diff --git a/js/ui/remoteSearch.js b/js/ui/remoteSearch.js
index b4e9202df..b7abb9c77 100644
--- a/js/ui/remoteSearch.js
+++ b/js/ui/remoteSearch.js
@@ -7,7 +7,6 @@ const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 
 const FileUtils = imports.misc.fileUtils;
-const Search = imports.ui.search;
 
 const KEY_FILE_GROUP = 'Shell Search Provider';
 
diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 4df315d17..3906e6d21 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -8,7 +8,6 @@ const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 
-const FileUtils = imports.misc.fileUtils;
 const Main = imports.ui.main;
 const ModalDialog = imports.ui.modalDialog;
 const ShellEntry = imports.ui.shellEntry;
diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index adbacfeeb..fe63b864a 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -27,7 +27,6 @@ const MessageTray = imports.ui.messageTray;
 const ShellDBus = imports.ui.shellDBus;
 const SmartcardManager = imports.misc.smartcardManager;
 const Tweener = imports.ui.tweener;
-const Util = imports.misc.util;
 
 const SCREENSAVER_SCHEMA = 'org.gnome.desktop.screensaver';
 const LOCK_ENABLED_KEY = 'lock-enabled';
diff --git a/js/ui/search.js b/js/ui/search.js
index c53761fc8..2a8415e29 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -4,17 +4,13 @@ const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
-const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
-const Atk = imports.gi.Atk;
 
 const AppDisplay = imports.ui.appDisplay;
-const DND = imports.ui.dnd;
 const IconGrid = imports.ui.iconGrid;
 const Main = imports.ui.main;
-const Overview = imports.ui.overview;
 const RemoteSearch = imports.ui.remoteSearch;
 const Util = imports.misc.util;
 
diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index 5a4e20418..25aa75a3d 100644
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Mainloop = imports.mainloop;
 const Signals = imports.signals;
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 5d1b04698..05ac14fc9 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -12,7 +12,6 @@ const ExtensionDownloader = imports.ui.extensionDownloader;
 const ExtensionUtils = imports.misc.extensionUtils;
 const Main = imports.ui.main;
 const Screenshot = imports.ui.screenshot;
-const ViewSelector = imports.ui.viewSelector;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
diff --git a/js/ui/slider.js b/js/ui/slider.js
index bef95e16f..19e634e7b 100644
--- a/js/ui/slider.js
+++ b/js/ui/slider.js
@@ -1,9 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Atk = imports.gi.Atk;
-const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
-const St = imports.gi.St;
 const Signals = imports.signals;
 
 const BarLevel = imports.ui.barLevel;
diff --git a/js/ui/status/accessibility.js b/js/ui/status/accessibility.js
index 65d67cb33..5072913d2 100644
--- a/js/ui/status/accessibility.js
+++ b/js/ui/status/accessibility.js
@@ -1,6 +1,5 @@
 // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
 
-const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
diff --git a/js/ui/status/location.js b/js/ui/status/location.js
index 9b623f072..07474f536 100644
--- a/js/ui/status/location.js
+++ b/js/ui/status/location.js
@@ -12,7 +12,6 @@ const ModalDialog = imports.ui.modalDialog;
 const PermissionStore = imports.misc.permissionStore;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const { loadInterfaceXML } = imports.misc.fileUtils;
 
diff --git a/js/ui/status/network.js b/js/ui/status/network.js
index 46fc51c09..c2c7a3dc5 100644
--- a/js/ui/status/network.js
+++ b/js/ui/status/network.js
@@ -6,7 +6,6 @@ const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;
 const NM = imports.gi.NM;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
 const Animation = imports.ui.animation;
diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
index 8e30e892f..d4a000334 100644
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -5,8 +5,6 @@ const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
diff --git a/js/ui/tweener.js b/js/ui/tweener.js
index 80e5838ad..499d9dc2f 100644
--- a/js/ui/tweener.js
+++ b/js/ui/tweener.js
@@ -2,7 +2,6 @@
 
 const Clutter = imports.gi.Clutter;
 const GLib = imports.gi.GLib;
-const Mainloop = imports.mainloop;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Signals = imports.signals;
diff --git a/js/ui/unlockDialog.js b/js/ui/unlockDialog.js
index 4bab2792b..79b34a724 100644
--- a/js/ui/unlockDialog.js
+++ b/js/ui/unlockDialog.js
@@ -6,7 +6,6 @@ const Clutter = imports.gi.Clutter;
 const Gdm  = imports.gi.Gdm;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
-const GnomeDesktop = imports.gi.GnomeDesktop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const Shell = imports.gi.Shell;
@@ -14,14 +13,8 @@ const St = imports.gi.St;
 
 const Layout = imports.ui.layout;
 const Main = imports.ui.main;
-const Panel = imports.ui.panel;
-const Tweener = imports.ui.tweener;
-const UserWidget = imports.ui.userWidget;
 
 const AuthPrompt = imports.gdm.authPrompt;
-const Batch = imports.gdm.batch;
-const GdmUtil = imports.gdm.util;
-const LoginDialog = imports.gdm.loginDialog;
 
 // The timeout before going back automatically to the lock screen (in seconds)
 const IDLE_TIMEOUT = 2 * 60;
diff --git a/js/ui/userWidget.js b/js/ui/userWidget.js
index a702ad842..88d4f1c9d 100644
--- a/js/ui/userWidget.js
+++ b/js/ui/userWidget.js
@@ -3,9 +3,7 @@
 // A widget showing the user avatar and name
 
 const Clutter = imports.gi.Clutter;
-const AccountsService = imports.gi.AccountsService;
 const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
 const St = imports.gi.St;
 
diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js
index 3f690982f..d887837a5 100644
--- a/js/ui/viewSelector.js
+++ b/js/ui/viewSelector.js
@@ -2,8 +2,6 @@
 
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
-const GLib = imports.gi.GLib;
-const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Signals = imports.signals;
 const Shell = imports.gi.Shell;
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 16239a255..bc7817f0e 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -6,7 +6,6 @@ const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 0fa74b670..f100131cf 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -15,7 +15,6 @@ const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const Tweener = imports.ui.tweener;
-const WindowManager = imports.ui.windowManager;
 
 var WINDOW_DND_SIZE = 256;
 
diff --git a/js/ui/workspaceSwitcherPopup.js b/js/ui/workspaceSwitcherPopup.js
index e96385345..7283f5ece 100644
--- a/js/ui/workspaceSwitcherPopup.js
+++ b/js/ui/workspaceSwitcherPopup.js
@@ -5,8 +5,6 @@ const GLib = imports.gi.GLib;
 const GObject = imports.gi.GObject;
 const Mainloop = imports.mainloop;
 const Meta  = imports.gi.Meta;
-const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const Main = imports.ui.main;
diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js
index e2417010f..ed7e3378b 100644
--- a/js/ui/workspaceThumbnail.js
+++ b/js/ui/workspaceThumbnail.js
@@ -14,7 +14,6 @@ const Background = imports.ui.background;
 const DND = imports.ui.dnd;
 const Main = imports.ui.main;
 const Tweener = imports.ui.tweener;
-const WindowManager = imports.ui.windowManager;
 const Workspace = imports.ui.workspace;
 const WorkspacesView = imports.ui.workspacesView;
 
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index a06ab32a8..eacb055f8 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -3,18 +3,13 @@
 const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GObject = imports.gi.GObject;
-const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Signals = imports.signals;
 
-const DND = imports.ui.dnd;
 const Main = imports.ui.main;
-const Overview = imports.ui.overview;
 const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;
-const WorkspaceThumbnail = imports.ui.workspaceThumbnail;
 
 var WORKSPACE_SWITCH_TIME = 0.25;
 
diff --git a/js/ui/xdndHandler.js b/js/ui/xdndHandler.js
index af968f42b..cd53e055b 100644
--- a/js/ui/xdndHandler.js
+++ b/js/ui/xdndHandler.js
@@ -3,7 +3,6 @@
 const Clutter = imports.gi.Clutter;
 const Main = imports.ui.main;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const DND = imports.ui.dnd;