From 742a5f415bc45819b11c77402efc114fa2f4451e Mon Sep 17 00:00:00 2001
From: Nathan van der Werf <nvanderwerf93@gmail.com>
Date: Wed, 15 Aug 2018 18:27:36 +0200
Subject: [PATCH] Remove unused imports

---
 modules/backend/ServiceProvider.php                            | 1 -
 modules/backend/formwidgets/Repeater.php                       | 1 -
 modules/backend/models/Preference.php                          | 1 -
 modules/backend/models/UserPreference.php                      | 2 --
 modules/backend/traits/FormModelSaver.php                      | 1 -
 modules/backend/widgets/Lists.php                              | 1 -
 modules/cms/ServiceProvider.php                                | 1 -
 modules/cms/classes/Asset.php                                  | 1 -
 modules/cms/classes/ComponentBase.php                          | 2 --
 modules/cms/classes/Controller.php                             | 3 ---
 modules/cms/classes/Page.php                                   | 2 --
 modules/cms/components/UnknownComponent.php                    | 1 -
 modules/cms/controllers/Index.php                              | 1 -
 modules/cms/controllers/ThemeLogs.php                          | 2 --
 modules/cms/controllers/ThemeOptions.php                       | 1 -
 modules/cms/controllers/Themes.php                             | 2 --
 modules/cms/twig/Extension.php                                 | 2 --
 modules/cms/twig/FlashNode.php                                 | 1 -
 modules/cms/twig/FlashTokenParser.php                          | 1 -
 modules/cms/widgets/AssetList.php                              | 2 --
 modules/system/ServiceProvider.php                             | 2 --
 modules/system/classes/CombineAssets.php                       | 1 -
 modules/system/classes/MailManager.php                         | 3 ---
 modules/system/classes/MarkupManager.php                       | 1 -
 modules/system/classes/PluginBase.php                          | 1 -
 modules/system/classes/SettingsManager.php                     | 2 --
 modules/system/classes/SystemController.php                    | 1 -
 modules/system/classes/UpdateManager.php                       | 1 -
 modules/system/console/OctoberDown.php                         | 1 -
 modules/system/console/OctoberFresh.php                        | 2 --
 modules/system/console/OctoberInstall.php                      | 2 --
 modules/system/console/OctoberUp.php                           | 2 --
 modules/system/console/OctoberUpdate.php                       | 1 -
 modules/system/console/PluginInstall.php                       | 1 -
 modules/system/console/PluginRefresh.php                       | 1 -
 modules/system/controllers/EventLogs.php                       | 2 --
 modules/system/controllers/MailBrandSettings.php               | 2 --
 modules/system/controllers/MailLayouts.php                     | 2 --
 modules/system/controllers/MailPartials.php                    | 2 --
 modules/system/controllers/MailTemplates.php                   | 1 -
 modules/system/controllers/RequestLogs.php                     | 2 --
 modules/system/controllers/Settings.php                        | 1 -
 .../2015_10_01_000014_Db_System_Mail_Layout_Rename.php         | 1 -
 modules/system/models/MailPartial.php                          | 1 -
 modules/system/models/Parameter.php                            | 1 -
 modules/system/traits/ConfigMaker.php                          | 1 -
 modules/system/twig/Extension.php                              | 2 --
 47 files changed, 69 deletions(-)

diff --git a/modules/backend/ServiceProvider.php b/modules/backend/ServiceProvider.php
index 195ab1856..92b503d08 100644
--- a/modules/backend/ServiceProvider.php
+++ b/modules/backend/ServiceProvider.php
@@ -1,7 +1,6 @@
 <?php namespace Backend;
 
 use App;
-use Backend;
 use BackendMenu;
 use BackendAuth;
 use Backend\Classes\WidgetManager;
diff --git a/modules/backend/formwidgets/Repeater.php b/modules/backend/formwidgets/Repeater.php
index 15786a842..e56da85aa 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/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 91c862e2e..d3e2239d7 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -16,7 +16,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..603052295 100644
--- a/modules/cms/ServiceProvider.php
+++ b/modules/cms/ServiceProvider.php
@@ -3,7 +3,6 @@
 use App;
 use Lang;
 use Event;
-use Backend;
 use BackendMenu;
 use BackendAuth;
 use Backend\Models\UserRole;
diff --git a/modules/cms/classes/Asset.php b/modules/cms/classes/Asset.php
index de6cd4096..6247fcb00 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/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 5b5c3d32a..43f80329c 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -22,13 +22,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/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 572afdcf1..1ef6f0504 100644
--- a/modules/cms/controllers/Index.php
+++ b/modules/cms/controllers/Index.php
@@ -21,7 +21,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..5e390217f 100644
--- a/modules/cms/controllers/ThemeLogs.php
+++ b/modules/cms/controllers/ThemeLogs.php
@@ -4,14 +4,12 @@ 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 6f44476ad..02fe3d30b 100644
--- a/modules/cms/controllers/ThemeOptions.php
+++ b/modules/cms/controllers/ThemeOptions.php
@@ -1,7 +1,6 @@
 <?php namespace Cms\Controllers;
 
 use Flash;
-use Backend;
 use BackendMenu;
 use ApplicationException;
 use Cms\Models\ThemeData;
diff --git a/modules/cms/controllers/Themes.php b/modules/cms/controllers/Themes.php
index ac3a06803..836fbbeb3 100644
--- a/modules/cms/controllers/Themes.php
+++ b/modules/cms/controllers/Themes.php
@@ -4,12 +4,10 @@ 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/twig/Extension.php b/modules/cms/twig/Extension.php
index f123a744e..0080dc02e 100644
--- a/modules/cms/twig/Extension.php
+++ b/modules/cms/twig/Extension.php
@@ -4,11 +4,9 @@ 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;
 
 /**
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..67e262f2f 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -12,11 +12,9 @@ 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/system/ServiceProvider.php b/modules/system/ServiceProvider.php
index a29e8f946..82a934d62 100644
--- a/modules/system/ServiceProvider.php
+++ b/modules/system/ServiceProvider.php
@@ -5,7 +5,6 @@ use Lang;
 use View;
 use Event;
 use Config;
-use Backend;
 use Request;
 use Validator;
 use BackendMenu;
@@ -22,7 +21,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/classes/CombineAssets.php b/modules/system/classes/CombineAssets.php
index 55bd26a5f..32d4e084c 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..945394157 100644
--- a/modules/system/classes/MailManager.php
+++ b/modules/system/classes/MailManager.php
@@ -1,13 +1,10 @@
 <?php namespace System\Classes;
 
-use Twig;
 use Markdown;
 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 9d169f277..4f7943700 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/PluginBase.php b/modules/system/classes/PluginBase.php
index 12ac9d933..7a0507544 100644
--- a/modules/system/classes/PluginBase.php
+++ b/modules/system/classes/PluginBase.php
@@ -4,7 +4,6 @@ use Illuminate\Support\ServiceProvider as ServiceProviderBase;
 use ReflectionClass;
 use SystemException;
 use Yaml;
-use Backend;
 
 /**
  * Plugin base class
diff --git a/modules/system/classes/SettingsManager.php b/modules/system/classes/SettingsManager.php
index 9b4b7f781..d2c389061 100644
--- a/modules/system/classes/SettingsManager.php
+++ b/modules/system/classes/SettingsManager.php
@@ -1,9 +1,7 @@
 <?php namespace System\Classes;
 
 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 43a01f4ea..afd2a9ad3 100644
--- a/modules/system/classes/UpdateManager.php
+++ b/modules/system/classes/UpdateManager.php
@@ -5,7 +5,6 @@ use App;
 use Url;
 use File;
 use Lang;
-use Http;
 use Cache;
 use Schema;
 use Config;
diff --git a/modules/system/console/OctoberDown.php b/modules/system/console/OctoberDown.php
index d895ad15e..a013acf53 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 ec918c3e9..57b95b869 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 b6661f246..7413f1969 100644
--- a/modules/system/console/OctoberInstall.php
+++ b/modules/system/console/OctoberInstall.php
@@ -8,8 +8,6 @@ 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 1fd9b2fa6..a122230ca 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 8ad277c5c..d9f508b0e 100644
--- a/modules/system/console/OctoberUpdate.php
+++ b/modules/system/console/OctoberUpdate.php
@@ -5,7 +5,6 @@ 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 a18dbcd9a..e6cae5d3c 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 91343e207..187ab0373 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..1c4814dfb 100644
--- a/modules/system/controllers/EventLogs.php
+++ b/modules/system/controllers/EventLogs.php
@@ -5,14 +5,12 @@ 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..a95c100fb 100644
--- a/modules/system/controllers/MailBrandSettings.php
+++ b/modules/system/controllers/MailBrandSettings.php
@@ -4,7 +4,6 @@ use Lang;
 use File;
 use Flash;
 use Config;
-use Backend;
 use Redirect;
 use BackendMenu;
 use ApplicationException;
@@ -14,7 +13,6 @@ 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..dbfa6956b 100644
--- a/modules/system/controllers/MailLayouts.php
+++ b/modules/system/controllers/MailLayouts.php
@@ -4,13 +4,11 @@ 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..acfb6a40d 100644
--- a/modules/system/controllers/MailPartials.php
+++ b/modules/system/controllers/MailPartials.php
@@ -4,13 +4,11 @@ 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..77389c65c 100644
--- a/modules/system/controllers/MailTemplates.php
+++ b/modules/system/controllers/MailTemplates.php
@@ -5,7 +5,6 @@ use Lang;
 use File;
 use Mail;
 use Flash;
-use Backend;
 use Redirect;
 use BackendMenu;
 use Backend\Classes\Controller;
diff --git a/modules/system/controllers/RequestLogs.php b/modules/system/controllers/RequestLogs.php
index e9a52eaad..d59150338 100644
--- a/modules/system/controllers/RequestLogs.php
+++ b/modules/system/controllers/RequestLogs.php
@@ -4,14 +4,12 @@ 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 8dedcdfe0..0197cd379 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -2,7 +2,6 @@
 
 use Lang;
 use Flash;
-use Backend;
 use Redirect;
 use BackendMenu;
 use System\Classes\SettingsManager;
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/models/MailPartial.php b/modules/system/models/MailPartial.php
index 00b8b23df..a69061c36 100644
--- a/modules/system/models/MailPartial.php
+++ b/modules/system/models/MailPartial.php
@@ -1,6 +1,5 @@
 <?php namespace System\Models;
 
-use Twig;
 use View;
 use Model;
 use Markdown;
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 01e12ba8f..5e4f95198 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/twig/Extension.php b/modules/system/twig/Extension.php
index 0c6e037fe..0097ee4ee 100644
--- a/modules/system/twig/Extension.php
+++ b/modules/system/twig/Extension.php
@@ -2,9 +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;