diff --git a/modules/backend/behaviors/FormController.php b/modules/backend/behaviors/FormController.php
index 8cba49f65..3a76b6e98 100644
--- a/modules/backend/behaviors/FormController.php
+++ b/modules/backend/behaviors/FormController.php
@@ -5,7 +5,6 @@ use Str;
 use Lang;
 use Flash;
 use Event;
-use Input;
 use Redirect;
 use Backend;
 use Backend\Classes\ControllerBehavior;
diff --git a/modules/backend/behaviors/ListController.php b/modules/backend/behaviors/ListController.php
index c0c6898d3..3a45521c2 100644
--- a/modules/backend/behaviors/ListController.php
+++ b/modules/backend/behaviors/ListController.php
@@ -1,6 +1,5 @@
 <?php namespace Backend\Behaviors;
 
-use Str;
 use Lang;
 use Event;
 use Flash;
diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 278c99d70..aa09da3d7 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -2,7 +2,6 @@
 
 use Db;
 use Lang;
-use Event;
 use Request;
 use Form as FormHelper;
 use Backend\Classes\ControllerBehavior;
diff --git a/modules/backend/classes/Controller.php b/modules/backend/classes/Controller.php
index 2374bec88..4ce71dfca 100644
--- a/modules/backend/classes/Controller.php
+++ b/modules/backend/classes/Controller.php
@@ -1,6 +1,5 @@
 <?php namespace Backend\Classes;
 
-use App;
 use Lang;
 use View;
 use Flash;
diff --git a/modules/backend/classes/WidgetBase.php b/modules/backend/classes/WidgetBase.php
index 11c2814d8..3444b91ad 100644
--- a/modules/backend/classes/WidgetBase.php
+++ b/modules/backend/classes/WidgetBase.php
@@ -1,7 +1,5 @@
 <?php namespace Backend\Classes;
 
-use Str;
-use File;
 use October\Rain\Html\Helper as HtmlHelper;
 use October\Rain\Extension\Extendable;
 use stdClass;
diff --git a/modules/backend/controllers/Index.php b/modules/backend/controllers/Index.php
index 962186efd..28f7289c1 100644
--- a/modules/backend/controllers/Index.php
+++ b/modules/backend/controllers/Index.php
@@ -1,7 +1,6 @@
 <?php namespace Backend\Controllers;
 
 use Redirect;
-use BackendAuth;
 use BackendMenu;
 use Backend\Classes\Controller;
 use Backend\Widgets\ReportContainer;
diff --git a/modules/backend/controllers/UserGroups.php b/modules/backend/controllers/UserGroups.php
index f0a0dab22..ed5e4d3e2 100644
--- a/modules/backend/controllers/UserGroups.php
+++ b/modules/backend/controllers/UserGroups.php
@@ -1,7 +1,6 @@
 <?php namespace Backend\Controllers;
 
 use BackendMenu;
-use BackendAuth;
 use Backend\Classes\Controller;
 use System\Classes\SettingsManager;
 
diff --git a/modules/backend/controllers/UserRoles.php b/modules/backend/controllers/UserRoles.php
index 942021cfe..caca7b288 100644
--- a/modules/backend/controllers/UserRoles.php
+++ b/modules/backend/controllers/UserRoles.php
@@ -3,7 +3,6 @@
 use View;
 use Response;
 use BackendMenu;
-use BackendAuth;
 use Backend\Classes\Controller;
 use System\Classes\SettingsManager;
 
diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
index 589ef468b..d2aead310 100644
--- a/modules/backend/formwidgets/FileUpload.php
+++ b/modules/backend/formwidgets/FileUpload.php
@@ -1,6 +1,5 @@
 <?php namespace Backend\FormWidgets;
 
-use Str;
 use Input;
 use Request;
 use Response;
diff --git a/modules/backend/formwidgets/MediaFinder.php b/modules/backend/formwidgets/MediaFinder.php
index 70c077b8c..87c8c4c65 100644
--- a/modules/backend/formwidgets/MediaFinder.php
+++ b/modules/backend/formwidgets/MediaFinder.php
@@ -1,7 +1,5 @@
 <?php namespace Backend\FormWidgets;
 
-use Lang;
-use ApplicationException;
 use System\Classes\MediaLibrary;
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
diff --git a/modules/backend/formwidgets/RecordFinder.php b/modules/backend/formwidgets/RecordFinder.php
index 29fe816cd..c8f212126 100644
--- a/modules/backend/formwidgets/RecordFinder.php
+++ b/modules/backend/formwidgets/RecordFinder.php
@@ -1,7 +1,5 @@
 <?php namespace Backend\FormWidgets;
 
-use Lang;
-use ApplicationException;
 use Backend\Classes\FormWidgetBase;
 
 /**
diff --git a/modules/backend/formwidgets/Relation.php b/modules/backend/formwidgets/Relation.php
index 27f8259a0..4851aba9f 100644
--- a/modules/backend/formwidgets/Relation.php
+++ b/modules/backend/formwidgets/Relation.php
@@ -1,11 +1,8 @@
 <?php namespace Backend\FormWidgets;
 
 use Db;
-use Lang;
 use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
-use ApplicationException;
-use SystemException;
 use Illuminate\Database\Eloquent\Relations\Relation as RelationBase;
 
 /**
diff --git a/modules/backend/formwidgets/Repeater.php b/modules/backend/formwidgets/Repeater.php
index 4debdfe72..6c0cdf269 100644
--- a/modules/backend/formwidgets/Repeater.php
+++ b/modules/backend/formwidgets/Repeater.php
@@ -2,7 +2,6 @@
 
 use Lang;
 use ApplicationException;
-use Backend\Classes\FormField;
 use Backend\Classes\FormWidgetBase;
 
 /**
diff --git a/modules/backend/models/Preference.php b/modules/backend/models/Preference.php
index 084c0b0b4..0715b8017 100644
--- a/modules/backend/models/Preference.php
+++ b/modules/backend/models/Preference.php
@@ -9,7 +9,6 @@ use BackendAuth;
 use DirectoryIterator;
 use DateTime;
 use DateTimeZone;
-use Carbon\Carbon;
 
 /**
  * Backend preferences for the backend user
diff --git a/modules/backend/models/UserPreference.php b/modules/backend/models/UserPreference.php
index 97a26e159..cb7ee5846 100644
--- a/modules/backend/models/UserPreference.php
+++ b/modules/backend/models/UserPreference.php
@@ -1,8 +1,6 @@
 <?php namespace Backend\Models;
 
-use Exception;
 use BackendAuth;
-use October\Rain\Database\Model;
 use SystemException;
 use October\Rain\Auth\Models\Preferences as PreferencesBase;
 
diff --git a/modules/backend/traits/FormModelSaver.php b/modules/backend/traits/FormModelSaver.php
index 17a422e22..2f33fa7e3 100644
--- a/modules/backend/traits/FormModelSaver.php
+++ b/modules/backend/traits/FormModelSaver.php
@@ -3,7 +3,6 @@
 use Str;
 use Backend\Classes\FormField;
 use October\Rain\Halcyon\Model as HalcyonModel;
-use October\Rain\Database\Model as DatabaseModel;
 
 /**
  * Implements special logic for processing form data, typically from from postback, and
diff --git a/modules/backend/traits/SessionMaker.php b/modules/backend/traits/SessionMaker.php
index 1af4dc71f..9483c2e4c 100644
--- a/modules/backend/traits/SessionMaker.php
+++ b/modules/backend/traits/SessionMaker.php
@@ -2,7 +2,6 @@
 
 use Str;
 use Session;
-use SystemException;
 
 /**
  * Session Maker Trait
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 45e790008..0a21fac55 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -1,10 +1,8 @@
 <?php namespace Backend\Widgets;
 
 use Db;
-use App;
 use Html;
 use Lang;
-use Input;
 use Backend;
 use DbDongle;
 use Carbon\Carbon;
@@ -16,7 +14,6 @@ use Backend\Classes\ListColumn;
 use Backend\Classes\WidgetBase;
 use October\Rain\Database\Model;
 use ApplicationException;
-use DateTime;
 
 /**
  * List Widget
diff --git a/modules/cms/ServiceProvider.php b/modules/cms/ServiceProvider.php
index 01da9d401..db411be3c 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -1,7 +1,6 @@
 <?php namespace Cms;
 
 use App;
-use Lang;
 use Event;
 use Backend;
 use BackendMenu;
diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php
index 48d4b4697..d64ed9956 100644
--- a/modules/cms/classes/Asset.php
+++ b/modules/cms/classes/Asset.php
@@ -3,7 +3,6 @@
 use File;
 use Lang;
 use Config;
-use Cms\Classes\Theme;
 use Cms\Helpers\File as FileHelper;
 use October\Rain\Extension\Extendable;
 use ApplicationException;
diff --git a/modules/cms/classes/CmsObjectCollection.php b/modules/cms/classes/CmsObjectCollection.php
index 57fcb7b56..dc5321106 100644
--- a/modules/cms/classes/CmsObjectCollection.php
+++ b/modules/cms/classes/CmsObjectCollection.php
@@ -1,6 +1,5 @@
 <?php namespace Cms\Classes;
 
-use ApplicationException;
 use October\Rain\Support\Collection as CollectionBase;
 
 /**
diff --git a/modules/cms/classes/ComponentBase.php b/modules/cms/classes/ComponentBase.php
index 9546cd4c0..efe067530 100644
--- a/modules/cms/classes/ComponentBase.php
+++ b/modules/cms/classes/ComponentBase.php
@@ -3,8 +3,6 @@
 use Str;
 use Lang;
 use Config;
-use Cms\Classes\CodeBase;
-use Cms\Classes\CmsException;
 use October\Rain\Extension\Extendable;
 use BadMethodCallException;
 
diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index 6188f0cdb..cbf411ee6 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -2,9 +2,7 @@
 
 use Cms;
 use Url;
-use Str;
 use App;
-use File;
 use View;
 use Lang;
 use Flash;
@@ -22,13 +20,10 @@ use Cms\Twig\Extension as CmsTwigExtension;
 use Cms\Models\MaintenanceSetting;
 use System\Models\RequestLog;
 use System\Helpers\View as ViewHelper;
-use System\Classes\ErrorHandler;
 use System\Classes\CombineAssets;
 use System\Twig\Extension as SystemTwigExtension;
 use October\Rain\Exception\AjaxException;
-use October\Rain\Exception\SystemException;
 use October\Rain\Exception\ValidationException;
-use October\Rain\Exception\ApplicationException;
 use October\Rain\Parse\Bracket as TextParser;
 use Illuminate\Http\RedirectResponse;
 
diff --git a/modules/cms/classes/Page.php b/modules/cms/classes/Page.php
index 4c1b9bef7..2ea4ce171 100644
--- a/modules/cms/classes/Page.php
+++ b/modules/cms/classes/Page.php
@@ -1,8 +1,6 @@
 <?php namespace Cms\Classes;
 
 use Lang;
-use Cms\Classes\Theme;
-use Cms\Classes\Layout;
 use ApplicationException;
 use October\Rain\Filesystem\Definitions as FileDefinitions;
 
diff --git a/modules/cms/classes/Router.php b/modules/cms/classes/Router.php
index e17bf37e0..709bcc680 100644
--- a/modules/cms/classes/Router.php
+++ b/modules/cms/classes/Router.php
@@ -5,7 +5,6 @@ use File;
 use Cache;
 use Config;
 use Event;
-use SystemException;
 use October\Rain\Router\Router as RainRouter;
 use October\Rain\Router\Helper as RouterHelper;
 
diff --git a/modules/cms/components/Resources.php b/modules/cms/components/Resources.php
index a8993997b..d5be4bbfb 100644
--- a/modules/cms/components/Resources.php
+++ b/modules/cms/components/Resources.php
@@ -1,7 +1,6 @@
 <?php namespace Cms\Components;
 
 use File;
-use Config;
 use Cms\Classes\ComponentBase;
 use System\Classes\CombineAssets;
 
diff --git a/modules/cms/components/UnknownComponent.php b/modules/cms/components/UnknownComponent.php
index aa2b6bcbb..9282216b4 100644
--- a/modules/cms/components/UnknownComponent.php
+++ b/modules/cms/components/UnknownComponent.php
@@ -1,6 +1,5 @@
 <?php namespace Cms\Components;
 
-use Cms\Classes\CodeBase;
 use Cms\Classes\ComponentBase;
 
 class UnknownComponent extends ComponentBase
diff --git a/modules/cms/controllers/Index.php b/modules/cms/controllers/Index.php
index b27b6f858..b2bb4f12e 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -5,7 +5,6 @@ use Lang;
 use Flash;
 use Config;
 use Request;
-use Response;
 use Exception;
 use BackendMenu;
 use Cms\Widgets\AssetList;
@@ -21,7 +20,6 @@ use Cms\Classes\CmsCompoundObject;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\ComponentPartial;
 use Backend\Classes\Controller;
-use Backend\Classes\WidgetManager;
 use October\Rain\Router\Router as RainRouter;
 use ApplicationException;
 use Cms\Classes\Asset;
diff --git a/modules/cms/controllers/ThemeLogs.php b/modules/cms/controllers/ThemeLogs.php
index 03bd0cd79..4e508fd6c 100644
--- a/modules/cms/controllers/ThemeLogs.php
+++ b/modules/cms/controllers/ThemeLogs.php
@@ -1,17 +1,11 @@
 <?php namespace Cms\Controllers;
 
-use Str;
 use Lang;
-use File;
 use Flash;
-use Backend;
-use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
-use ApplicationException;
 use System\Classes\SettingsManager;
 use Cms\Models\ThemeLog;
-use Exception;
 
 /**
  * Request Logs controller
diff --git a/modules/cms/controllers/ThemeOptions.php b/modules/cms/controllers/ThemeOptions.php
index 9be5d4766..cde36f052 100644
--- a/modules/cms/controllers/ThemeOptions.php
+++ b/modules/cms/controllers/ThemeOptions.php
@@ -1,6 +1,5 @@
 <?php namespace Cms\Controllers;
 
-use Flash;
 use Backend;
 use BackendMenu;
 use ApplicationException;
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index dd25ac807..0f780b20e 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -1,15 +1,12 @@
 <?php namespace Cms\Controllers;
 
 use File;
-use Yaml;
 use Flash;
-use Config;
 use Backend;
 use Redirect;
 use BackendMenu;
 use ValidationException;
 use ApplicationException;
-use Cms\Models\ThemeData;
 use Cms\Models\ThemeExport;
 use Cms\Models\ThemeImport;
 use Cms\Classes\Theme as CmsTheme;
diff --git a/modules/cms/formwidgets/Components.php b/modules/cms/formwidgets/Components.php
index 5963fd3fb..de3051e3c 100644
--- a/modules/cms/formwidgets/Components.php
+++ b/modules/cms/formwidgets/Components.php
@@ -1,6 +1,5 @@
 <?php namespace Cms\FormWidgets;
 
-use Lang;
 use Backend\Classes\FormWidgetBase;
 use Cms\Classes\ComponentManager;
 use Cms\Classes\ComponentHelpers;
diff --git a/modules/cms/models/ThemeExport.php b/modules/cms/models/ThemeExport.php
index 6368ac944..c568a7736 100644
--- a/modules/cms/models/ThemeExport.php
+++ b/modules/cms/models/ThemeExport.php
@@ -1,7 +1,6 @@
 <?php namespace Cms\Models;
 
 use File;
-use Lang;
 use Model;
 use Response;
 use ApplicationException;
diff --git a/modules/cms/models/ThemeImport.php b/modules/cms/models/ThemeImport.php
index 7ee99b96f..d9e6f9274 100644
--- a/modules/cms/models/ThemeImport.php
+++ b/modules/cms/models/ThemeImport.php
@@ -1,7 +1,6 @@
 <?php namespace Cms\Models;
 
 use File;
-use Lang;
 use Model;
 use ApplicationException;
 use October\Rain\Filesystem\Zip;
diff --git a/modules/cms/twig/Extension.php b/modules/cms/twig/Extension.php
index f123a744e..4b1987f0d 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -1,15 +1,11 @@
 <?php namespace Cms\Twig;
 
-use Flash;
 use Block;
 use Event;
 use Twig_Extension;
-use Twig_TokenParser;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 use Cms\Classes\Controller;
-use Cms\Classes\CmsException;
-use ApplicationException;
 
 /**
  * The CMS Twig extension class implements the basic CMS Twig functions and filters.
diff --git a/modules/cms/twig/FlashNode.php b/modules/cms/twig/FlashNode.php
index 1658b8bc6..0e272e199 100644
--- a/modules/cms/twig/FlashNode.php
+++ b/modules/cms/twig/FlashNode.php
@@ -2,7 +2,6 @@
 
 use Twig_Node;
 use Twig_Compiler;
-use Twig_Node_Expression;
 
 /**
  * Represents a flash node
diff --git a/modules/cms/twig/FlashTokenParser.php b/modules/cms/twig/FlashTokenParser.php
index aca671b77..a7acb53cb 100644
--- a/modules/cms/twig/FlashTokenParser.php
+++ b/modules/cms/twig/FlashTokenParser.php
@@ -2,7 +2,6 @@
 
 use Twig_Node;
 use Twig_Token;
-use Twig_Node_Print;
 use Twig_TokenParser;
 
 /**
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index 201968324..667169cf3 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -5,18 +5,12 @@ use Url;
 use File;
 use Lang;
 use Input;
-use Config;
 use Request;
-use Response;
-use Validator;
 use Cms\Classes\Theme;
 use Cms\Classes\Asset;
 use Backend\Classes\WidgetBase;
-use System\Classes\PluginManager;
 use ApplicationException;
-use ValidationException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
-use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeGuesser;
 use October\Rain\Filesystem\Definitions as FileDefinitions;
 use RecursiveIteratorIterator;
 use RecursiveDirectoryIterator;
diff --git a/modules/cms/widgets/TemplateList.php b/modules/cms/widgets/TemplateList.php
index f81aaa056..40386cecd 100644
--- a/modules/cms/widgets/TemplateList.php
+++ b/modules/cms/widgets/TemplateList.php
@@ -4,7 +4,6 @@ use Str;
 use File;
 use Input;
 use Request;
-use Response;
 use Cms\Classes\Theme;
 use Backend\Classes\WidgetBase;
 
diff --git a/modules/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index a29e8f946..c3a651f1f 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -1,13 +1,11 @@
 <?php namespace System;
 
 use App;
-use Lang;
 use View;
 use Event;
 use Config;
 use Backend;
 use Request;
-use Validator;
 use BackendMenu;
 use BackendAuth;
 use Twig_Environment;
@@ -22,7 +20,6 @@ use System\Twig\Loader as TwigLoader;
 use System\Twig\Extension as TwigExtension;
 use System\Models\EventLog;
 use System\Models\MailSetting;
-use System\Models\MailTemplate;
 use System\Classes\CombineAssets;
 use Backend\Classes\WidgetManager;
 use October\Rain\Support\ModuleServiceProvider;
diff --git a/modules/system/behaviors/SettingsModel.php b/modules/system/behaviors/SettingsModel.php
index 604e98901..3dd8f02c5 100644
--- a/modules/system/behaviors/SettingsModel.php
+++ b/modules/system/behaviors/SettingsModel.php
@@ -6,7 +6,6 @@ use Cache;
 use Log;
 use Exception;
 use System\Classes\ModelBehavior;
-use ApplicationException;
 
 /**
  * Settings model extension
diff --git a/modules/system/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index 0d8427e13..34dceea32 100644
--- a/modules/system/classes/CombineAssets.php
+++ b/modules/system/classes/CombineAssets.php
@@ -11,7 +11,6 @@ use Config;
 use Request;
 use Response;
 use Assetic\Asset\FileAsset;
-use Assetic\Asset\GlobAsset;
 use Assetic\Asset\AssetCache;
 use Assetic\Asset\AssetCollection;
 use Assetic\Factory\AssetFactory;
diff --git a/modules/system/classes/MailManager.php b/modules/system/classes/MailManager.php
index 3dd1be6c3..a38e53d3e 100644
--- a/modules/system/classes/MailManager.php
+++ b/modules/system/classes/MailManager.php
@@ -6,8 +6,6 @@ use System\Models\MailPartial;
 use System\Models\MailTemplate;
 use System\Models\MailBrandSetting;
 use System\Helpers\View as ViewHelper;
-use System\Classes\PluginManager;
-use System\Classes\MarkupManager;
 use System\Twig\MailPartialTokenParser;
 use TijsVerkoyen\CssToInlineStyles\CssToInlineStyles;
 
diff --git a/modules/system/classes/MarkupManager.php b/modules/system/classes/MarkupManager.php
index 523848b36..7708021a2 100644
--- a/modules/system/classes/MarkupManager.php
+++ b/modules/system/classes/MarkupManager.php
@@ -5,7 +5,6 @@ use Twig_TokenParser;
 use Twig_SimpleFilter;
 use Twig_SimpleFunction;
 use ApplicationException;
-use System\Classes\PluginManager;
 
 /**
  * This class manages Twig functions, token parsers and filters.
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index 9b4b7f781..e6c679122 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -3,7 +3,6 @@
 use Event;
 use Backend;
 use BackendAuth;
-use System\Classes\PluginManager;
 use SystemException;
 
 /**
diff --git a/modules/system/classes/SystemController.php b/modules/system/classes/SystemController.php
index 8fa3e4a06..edfe60981 100644
--- a/modules/system/classes/SystemController.php
+++ b/modules/system/classes/SystemController.php
@@ -2,7 +2,6 @@
 
 use Lang;
 use ApplicationException;
-use System\Classes\CombineAssets;
 use Illuminate\Routing\Controller as ControllerBase;
 use Exception;
 
diff --git a/modules/system/classes/UpdateManager.php b/modules/system/classes/UpdateManager.php
index b16734349..5831a1e32 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -1,6 +1,5 @@
 <?php namespace System\Classes;
 
-use Db;
 use App;
 use Url;
 use File;
diff --git a/modules/system/classes/VersionManager.php b/modules/system/classes/VersionManager.php
index 4fd08f953..04a199d18 100644
--- a/modules/system/classes/VersionManager.php
+++ b/modules/system/classes/VersionManager.php
@@ -1,6 +1,5 @@
 <?php namespace System\Classes;
 
-use Str;
 use File;
 use Yaml;
 use Db;
diff --git a/modules/system/console/OctoberDown.php b/modules/system/console/OctoberDown.php
index ebff07a64..5f39fdba9 100644
--- a/modules/system/console/OctoberDown.php
+++ b/modules/system/console/OctoberDown.php
@@ -3,7 +3,6 @@
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Console command to tear down the database.
diff --git a/modules/system/console/OctoberFresh.php b/modules/system/console/OctoberFresh.php
index b32c32854..e87e5422d 100644
--- a/modules/system/console/OctoberFresh.php
+++ b/modules/system/console/OctoberFresh.php
@@ -2,8 +2,6 @@
 
 use File;
 use Artisan;
-use Cms\Classes\Theme;
-use Cms\Classes\ThemeManager;
 use Illuminate\Console\Command;
 use Symfony\Component\Console\Input\InputOption;
 
diff --git a/modules/system/console/OctoberInstall.php b/modules/system/console/OctoberInstall.php
index a953cb9a0..feb39002c 100644
--- a/modules/system/console/OctoberInstall.php
+++ b/modules/system/console/OctoberInstall.php
@@ -3,13 +3,9 @@
 use Db;
 use App;
 use Str;
-use Url;
 use PDO;
 use File;
 use Config;
-use Artisan;
-use Cms\Classes\Theme;
-use Cms\Classes\ThemeManager;
 use Backend\Database\Seeds\SeedSetupAdmin;
 use System\Classes\UpdateManager;
 use October\Rain\Config\ConfigWriter;
diff --git a/modules/system/console/OctoberUp.php b/modules/system/console/OctoberUp.php
index b4fd908a1..a599732b6 100644
--- a/modules/system/console/OctoberUp.php
+++ b/modules/system/console/OctoberUp.php
@@ -2,8 +2,6 @@
 
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Console command to migrate the database.
diff --git a/modules/system/console/OctoberUpdate.php b/modules/system/console/OctoberUpdate.php
index f44541f94..b826fe305 100644
--- a/modules/system/console/OctoberUpdate.php
+++ b/modules/system/console/OctoberUpdate.php
@@ -1,11 +1,9 @@
 <?php namespace System\Console;
 
 use Str;
-use Config;
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
 use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
 
 /**
  * Console command to perform a system update.
diff --git a/modules/system/console/PluginInstall.php b/modules/system/console/PluginInstall.php
index 1586108b7..4b7420a79 100644
--- a/modules/system/console/PluginInstall.php
+++ b/modules/system/console/PluginInstall.php
@@ -2,7 +2,6 @@
 
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 use System\Classes\PluginManager;
 
diff --git a/modules/system/console/PluginRefresh.php b/modules/system/console/PluginRefresh.php
index 11749721c..b79be41ca 100644
--- a/modules/system/console/PluginRefresh.php
+++ b/modules/system/console/PluginRefresh.php
@@ -3,7 +3,6 @@
 use Illuminate\Console\Command;
 use System\Classes\UpdateManager;
 use System\Classes\PluginManager;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputArgument;
 
 /**
diff --git a/modules/system/controllers/EventLogs.php b/modules/system/controllers/EventLogs.php
index b303b978c..b8a3b3677 100644
--- a/modules/system/controllers/EventLogs.php
+++ b/modules/system/controllers/EventLogs.php
@@ -1,18 +1,12 @@
 <?php namespace System\Controllers;
 
 use App;
-use Str;
 use Lang;
-use File;
 use Flash;
-use Backend;
-use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
-use ApplicationException;
 use System\Classes\SettingsManager;
 use System\Models\EventLog;
-use Exception;
 
 /**
  * Event Logs controller
diff --git a/modules/system/controllers/MailBrandSettings.php b/modules/system/controllers/MailBrandSettings.php
index f316c5079..ec3263f8b 100644
--- a/modules/system/controllers/MailBrandSettings.php
+++ b/modules/system/controllers/MailBrandSettings.php
@@ -4,17 +4,14 @@ use Lang;
 use File;
 use Flash;
 use Config;
-use Backend;
 use Redirect;
 use BackendMenu;
-use ApplicationException;
 use System\Models\MailBrandSetting;
 use System\Classes\SettingsManager;
 use System\Classes\MailManager;
 use Backend\Classes\Controller;
 use System\Models\MailLayout;
 use System\Models\MailTemplate;
-use Exception;
 
 /**
  * Mail brand customization controller
diff --git a/modules/system/controllers/MailLayouts.php b/modules/system/controllers/MailLayouts.php
index 126797cd4..1dd97d5af 100644
--- a/modules/system/controllers/MailLayouts.php
+++ b/modules/system/controllers/MailLayouts.php
@@ -1,16 +1,11 @@
 <?php namespace System\Controllers;
 
-use Str;
 use Lang;
-use File;
 use Flash;
-use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
-use ApplicationException;
 use System\Classes\SettingsManager;
-use Exception;
 
 /**
  * Mail layouts controller
diff --git a/modules/system/controllers/MailPartials.php b/modules/system/controllers/MailPartials.php
index 93536a2ed..481f93101 100644
--- a/modules/system/controllers/MailPartials.php
+++ b/modules/system/controllers/MailPartials.php
@@ -1,16 +1,8 @@
 <?php namespace System\Controllers;
 
-use Str;
-use Lang;
-use File;
-use Flash;
-use Backend;
-use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
-use ApplicationException;
 use System\Classes\SettingsManager;
-use Exception;
 
 /**
  * Mail partials controller
diff --git a/modules/system/controllers/MailTemplates.php b/modules/system/controllers/MailTemplates.php
index dc9c90e46..a3d87b0b9 100644
--- a/modules/system/controllers/MailTemplates.php
+++ b/modules/system/controllers/MailTemplates.php
@@ -1,16 +1,10 @@
 <?php namespace System\Controllers;
 
-use Str;
-use Lang;
-use File;
 use Mail;
 use Flash;
-use Backend;
-use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
 use System\Models\MailTemplate;
-use ApplicationException;
 use System\Classes\SettingsManager;
 use Exception;
 
diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php
index e9a52eaad..435f6f968 100644
--- a/modules/system/controllers/RequestLogs.php
+++ b/modules/system/controllers/RequestLogs.php
@@ -1,17 +1,11 @@
 <?php namespace System\Controllers;
 
-use Str;
 use Lang;
-use File;
 use Flash;
-use Backend;
-use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
-use ApplicationException;
 use System\Classes\SettingsManager;
 use System\Models\RequestLog;
-use Exception;
 
 /**
  * Request Logs controller
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 33cb8fc4c..7ba29dea7 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -3,7 +3,6 @@
 use Lang;
 use Flash;
 use Backend;
-use Redirect;
 use BackendMenu;
 use System\Classes\SettingsManager;
 use Backend\Classes\Controller;
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index 202668500..3f67d2cdd 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -1,12 +1,10 @@
 <?php namespace System\Controllers;
 
-use Str;
 use Lang;
 use Html;
 use Yaml;
 use File;
 use Flash;
-use Config;
 use Backend;
 use Markdown;
 use Redirect;
diff --git a/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
index a89063f78..7102c02c8 100644
--- a/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
+++ b/modules/system/database/migrations/2015_10_01_000014_Db_System_Mail_Layout_Rename.php
@@ -1,7 +1,6 @@
 <?php
 
 use System\Models\MailLayout;
-use October\Rain\Database\Schema\Blueprint;
 use October\Rain\Database\Updates\Migration;
 
 class DbSystemMailLayoutRename extends Migration
diff --git a/modules/system/helpers/DateTime.php b/modules/system/helpers/DateTime.php
index e8a68ebaa..4aaa80eb5 100644
--- a/modules/system/helpers/DateTime.php
+++ b/modules/system/helpers/DateTime.php
@@ -1,6 +1,5 @@
 <?php namespace System\Helpers;
 
-use Lang;
 use Carbon\Carbon;
 use DateTime as PhpDateTime;
 use InvalidArgumentException;
diff --git a/modules/system/models/LogSetting.php b/modules/system/models/LogSetting.php
index ad9be0283..a048f568a 100644
--- a/modules/system/models/LogSetting.php
+++ b/modules/system/models/LogSetting.php
@@ -1,7 +1,6 @@
 <?php namespace System\Models;
 
 use Model;
-use ApplicationException;
 
 /**
  * System log settings
diff --git a/modules/system/models/MailBrandSetting.php b/modules/system/models/MailBrandSetting.php
index 95d467d04..9f2a075c5 100644
--- a/modules/system/models/MailBrandSetting.php
+++ b/modules/system/models/MailBrandSetting.php
@@ -1,12 +1,9 @@
 <?php namespace System\Models;
 
 use App;
-use Url;
 use Str;
-use Lang;
 use Model;
 use Cache;
-use Config;
 use Less_Parser;
 use Exception;
 use File as FileHelper;
diff --git a/modules/system/models/MailPartial.php b/modules/system/models/MailPartial.php
index 00b8b23df..ac1971690 100644
--- a/modules/system/models/MailPartial.php
+++ b/modules/system/models/MailPartial.php
@@ -1,9 +1,7 @@
 <?php namespace System\Models;
 
-use Twig;
 use View;
 use Model;
-use Markdown;
 use System\Classes\MailManager;
 use October\Rain\Mail\MailParser;
 use ApplicationException;
diff --git a/modules/system/models/MailTemplate.php b/modules/system/models/MailTemplate.php
index 62b98d541..b2ad9b866 100644
--- a/modules/system/models/MailTemplate.php
+++ b/modules/system/models/MailTemplate.php
@@ -1,6 +1,5 @@
 <?php namespace System\Models;
 
-use App;
 use View;
 use Model;
 use System\Classes\MailManager;
diff --git a/modules/system/models/Parameter.php b/modules/system/models/Parameter.php
index 3ebecbf09..65eb50f70 100644
--- a/modules/system/models/Parameter.php
+++ b/modules/system/models/Parameter.php
@@ -2,7 +2,6 @@
 
 use Cache;
 use October\Rain\Database\Model;
-use Exception;
 
 /**
  * Parameters model
diff --git a/modules/system/traits/ConfigMaker.php b/modules/system/traits/ConfigMaker.php
index ea76c969d..0b068227f 100644
--- a/modules/system/traits/ConfigMaker.php
+++ b/modules/system/traits/ConfigMaker.php
@@ -5,7 +5,6 @@ use File;
 use Lang;
 use Event;
 use SystemException;
-use Backend\Classes\Controller;
 use stdClass;
 use Config;
 
diff --git a/modules/system/traits/ViewMaker.php b/modules/system/traits/ViewMaker.php
index 36255383e..21cc17d84 100644
--- a/modules/system/traits/ViewMaker.php
+++ b/modules/system/traits/ViewMaker.php
@@ -2,7 +2,6 @@
 
 use File;
 use Lang;
-use Event;
 use Block;
 use SystemException;
 use Exception;
diff --git a/modules/system/twig/Extension.php b/modules/system/twig/Extension.php
index 0c6e037fe..36b7b8ae3 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -2,10 +2,7 @@
 
 use Url;
 use Twig_Extension;
-use Twig_TokenParser;
 use Twig_SimpleFilter;
-use Twig_SimpleFunction;
-use ApplicationException;
 use System\Classes\MediaLibrary;
 use System\Classes\MarkupManager;