diff --git a/js/misc/docInfo.js b/js/misc/docInfo.js
index a6df05637..0774a2887 100644
--- a/js/misc/docInfo.js
+++ b/js/misc/docInfo.js
@@ -1,15 +1,10 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const Search = imports.ui.search;
-const Main = imports.ui.main;
 
 const THUMBNAIL_ICON_MARGIN = 2;
 
diff --git a/js/ui/altTab.js b/js/ui/altTab.js
index d1b967e9b..f3b6b1ee2 100644
--- a/js/ui/altTab.js
+++ b/js/ui/altTab.js
@@ -4,8 +4,6 @@ const Clutter = imports.gi.Clutter;
 const Gdk = imports.gi.Gdk;
 const Lang = imports.lang;
 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;
diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js
index 3a9e4c5a0..f87bf58e9 100644
--- a/js/ui/appDisplay.js
+++ b/js/ui/appDisplay.js
@@ -1,9 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
-const GLib = imports.gi.GLib;
-const Gio = imports.gi.Gio;
 const Gtk = imports.gi.Gtk;
 const Shell = imports.gi.Shell;
 const Lang = imports.lang;
@@ -15,7 +12,6 @@ const _ = Gettext.gettext;
 
 const AppFavorites = imports.ui.appFavorites;
 const DND = imports.ui.dnd;
-const GenericDisplay = imports.ui.genericDisplay;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js
index 1f651c692..d6bd0d0c8 100644
--- a/js/ui/boxpointer.js
+++ b/js/ui/boxpointer.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const St = imports.gi.St;
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 02a264e01..a26f12305 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -5,7 +5,6 @@ const Gio = imports.gi.Gio;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
 const Gettext_gtk20 = imports.gettext.domain('gtk20');
 
 const MSECS_IN_DAY = 24 * 60 * 60 * 1000;
diff --git a/js/ui/chrome.js b/js/ui/chrome.js
index cb913dd7c..524ae9e28 100644
--- a/js/ui/chrome.js
+++ b/js/ui/chrome.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
diff --git a/js/ui/dash.js b/js/ui/dash.js
index 0693f2370..4971e8185 100644
--- a/js/ui/dash.js
+++ b/js/ui/dash.js
@@ -1,10 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
-const Pango = imports.gi.Pango;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const St = imports.gi.St;
@@ -15,7 +12,6 @@ const AppDisplay = imports.ui.appDisplay;
 const DND = imports.ui.dnd;
 const DocDisplay = imports.ui.docDisplay;
 const PlaceDisplay = imports.ui.placeDisplay;
-const GenericDisplay = imports.ui.genericDisplay;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
 const Search = imports.ui.search;
diff --git a/js/ui/docDisplay.js b/js/ui/docDisplay.js
index f9abfc866..17c3d415f 100644
--- a/js/ui/docDisplay.js
+++ b/js/ui/docDisplay.js
@@ -1,10 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const Pango = imports.gi.Pango;
 const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index fa88421f5..944e2e546 100644
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -3,7 +3,6 @@
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const St = imports.gi.St;
-const Shell = imports.gi.Shell;
 
 const ExtensionState = {
     ENABLED: 1,
diff --git a/js/ui/genericDisplay.js b/js/ui/genericDisplay.js
index 1d86399a5..071599315 100644
--- a/js/ui/genericDisplay.js
+++ b/js/ui/genericDisplay.js
@@ -1,15 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gdk = imports.gi.Gdk;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Meta = imports.gi.Meta;
-const Pango = imports.gi.Pango;
 const Signals = imports.signals;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
 const DND = imports.ui.dnd;
diff --git a/js/ui/lightbox.js b/js/ui/lightbox.js
index 8c6937745..426308de2 100644
--- a/js/ui/lightbox.js
+++ b/js/ui/lightbox.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
diff --git a/js/ui/link.js b/js/ui/link.js
index 7b694dff2..d535311bb 100644
--- a/js/ui/link.js
+++ b/js/ui/link.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Signals = imports.signals;
 const St = imports.gi.St;
diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
index 3b701a56b..d29197432 100644
--- a/js/ui/magnifier.js
+++ b/js/ui/magnifier.js
@@ -1,9 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const DBus = imports.dbus;
 const GConf = imports.gi.GConf;
-const Gtk = imports.gi.Gtk;
-const Gdk = imports.gi.Gdk;
 const Clutter = imports.gi.Clutter;
 const Shell = imports.gi.Shell;
 const St = imports.gi.St;
diff --git a/js/ui/main.js b/js/ui/main.js
index 7c524b3cb..c40964226 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -16,7 +16,6 @@ const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const Shell = imports.gi.Shell;
-const Signals = imports.signals;
 const St = imports.gi.St;
 
 const Chrome = imports.ui.chrome;
diff --git a/js/ui/overview.js b/js/ui/overview.js
index ff5c4c51f..5187ca547 100644
--- a/js/ui/overview.js
+++ b/js/ui/overview.js
@@ -1,19 +1,13 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
 const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const Lang = imports.lang;
 const St = imports.gi.St;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
-const AppDisplay = imports.ui.appDisplay;
-const DocDisplay = imports.ui.docDisplay;
-const GenericDisplay = imports.ui.genericDisplay;
 const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Panel = imports.ui.panel;
diff --git a/js/ui/panel.js b/js/ui/panel.js
index 0686b22da..be36da03a 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -1,23 +1,17 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
-const GConf = imports.gi.GConf;
 const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 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 DBus = imports.dbus;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
 const AppDisplay = imports.ui.appDisplay;
-const BoxPointer = imports.ui.boxpointer;
 const Calendar = imports.ui.calendar;
 const Overview = imports.ui.overview;
 const PopupMenu = imports.ui.popupMenu;
diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js
index 1689cf59a..5bc3a6ac8 100644
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -1,7 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
-const Pango = imports.gi.Pango;
 const GConf = imports.gi.GConf;
 const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index d2d3a2f9e..8ac9ef65b 100644
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -4,8 +4,6 @@ const Cairo = imports.cairo;
 const Clutter = imports.gi.Clutter;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 const Signals = imports.signals;
 
diff --git a/js/ui/runDialog.js b/js/ui/runDialog.js
index 8aeb1800d..aae73924a 100644
--- a/js/ui/runDialog.js
+++ b/js/ui/runDialog.js
@@ -4,7 +4,6 @@ const Clutter = imports.gi.Clutter;
 const Gio = imports.gi.Gio;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
 const St = imports.gi.St;
 const Shell = imports.gi.Shell;
diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index 0addd5424..b2537f224 100644
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -1,6 +1,5 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const GLib = imports.gi.GLib;
 const Gio = imports.gi.Gio;
 const Mainloop = imports.mainloop;
 
diff --git a/js/ui/search.js b/js/ui/search.js
index cebe23273..fea4198f3 100644
--- a/js/ui/search.js
+++ b/js/ui/search.js
@@ -1,7 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Signals = imports.signals;
-const St = imports.gi.St;
 
 const RESULT_ICON_SIZE = 24;
 
diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 4eebb5a20..c67028740 100644
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -1,9 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const DBus = imports.dbus;
-const Lang = imports.lang;
-const Shell = imports.gi.Shell;
-const Mainloop = imports.mainloop;
 
 const Main = imports.ui.main;
 
diff --git a/js/ui/statusMenu.js b/js/ui/statusMenu.js
index ce1355552..fee4e9ff2 100644
--- a/js/ui/statusMenu.js
+++ b/js/ui/statusMenu.js
@@ -10,7 +10,6 @@ const _ = Gettext.gettext;
 
 const GnomeSession = imports.misc.gnomeSession;
 const Main = imports.ui.main;
-const Panel = imports.ui.panel;
 const PanelMenu = imports.ui.panelMenu;
 const PopupMenu = imports.ui.popupMenu;
 
diff --git a/js/ui/telepathyClient.js b/js/ui/telepathyClient.js
index 5bf0065e0..c254489c9 100644
--- a/js/ui/telepathyClient.js
+++ b/js/ui/telepathyClient.js
@@ -1,10 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const DBus = imports.dbus;
 const GLib = imports.gi.GLib;
 const Lang = imports.lang;
-const Shell = imports.gi.Shell;
 const Signals = imports.signals;
 const St = imports.gi.St;
 const Gettext = imports.gettext.domain('gnome-shell');
diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js
index d333c268e..ceba3f9ef 100644
--- a/js/ui/windowAttentionHandler.js
+++ b/js/ui/windowAttentionHandler.js
@@ -1,9 +1,7 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
-const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
 const Shell = imports.gi.Shell;
-const Meta = imports.gi.Meta;
 const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
index 86e1ea331..6d0ea4411 100644
--- a/js/ui/windowManager.js
+++ b/js/ui/windowManager.js
@@ -2,9 +2,7 @@
 
 const Clutter = imports.gi.Clutter;
 const Lang = imports.lang;
-const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
-const Shell = imports.gi.Shell;
 const St = imports.gi.St;
 
 const AltTab = imports.ui.altTab;
diff --git a/js/ui/workspace.js b/js/ui/workspace.js
index 7b5906900..95adb2f3b 100644
--- a/js/ui/workspace.js
+++ b/js/ui/workspace.js
@@ -1,9 +1,6 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gdk = imports.gi.Gdk;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 const Mainloop = imports.mainloop;
 const Meta = imports.gi.Meta;
diff --git a/js/ui/workspacesView.js b/js/ui/workspacesView.js
index 1f2e315c3..db6700557 100644
--- a/js/ui/workspacesView.js
+++ b/js/ui/workspacesView.js
@@ -1,13 +1,8 @@
 /* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
 
 const Clutter = imports.gi.Clutter;
-const GdkPixbuf = imports.gi.GdkPixbuf;
-const Gdk = imports.gi.Gdk;
-const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 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;
@@ -15,10 +10,8 @@ const Gettext = imports.gettext.domain('gnome-shell');
 const _ = Gettext.gettext;
 
 const DND = imports.ui.dnd;
-const Lightbox = imports.ui.lightbox;
 const Main = imports.ui.main;
 const Overview = imports.ui.overview;
-const Panel = imports.ui.panel;
 const Tweener = imports.ui.tweener;
 const Workspace = imports.ui.workspace;