diff --git a/system/src/Grav/Common/Config/Blueprints.php b/system/src/Grav/Common/Config/Blueprints.php
index d52a3e138..1af61f47c 100644
--- a/system/src/Grav/Common/Config/Blueprints.php
+++ b/system/src/Grav/Common/Config/Blueprints.php
@@ -3,7 +3,6 @@ namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
-use Grav\Common\GravTrait;
 use Grav\Common\Filesystem\Folder;
 use RocketTheme\Toolbox\Blueprints\Blueprints as BaseBlueprints;
 use RocketTheme\Toolbox\File\PhpFile;
diff --git a/system/src/Grav/Common/Config/Config.php b/system/src/Grav/Common/Config/Config.php
index 5d41b9b5c..1fe373a40 100644
--- a/system/src/Grav/Common/Config/Config.php
+++ b/system/src/Grav/Common/Config/Config.php
@@ -3,10 +3,7 @@ namespace Grav\Common\Config;
 
 use Grav\Common\File\CompiledYamlFile;
 use Grav\Common\Grav;
-use Grav\Common\GravTrait;
-use Grav\Common\Uri;
 use Grav\Common\Data\Data;
-use Grav\Common\Filesystem\Folder;
 use RocketTheme\Toolbox\Blueprints\Blueprints;
 use RocketTheme\Toolbox\File\PhpFile;
 use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
diff --git a/system/src/Grav/Common/Debugger.php b/system/src/Grav/Common/Debugger.php
index ad1bef70c..e71e14f8f 100644
--- a/system/src/Grav/Common/Debugger.php
+++ b/system/src/Grav/Common/Debugger.php
@@ -1,10 +1,8 @@
 <?php
 namespace Grav\Common;
 
-use DebugBar\Bridge\Twig\TraceableTwigEnvironment;
 use DebugBar\JavascriptRenderer;
 use DebugBar\StandardDebugBar;
-//use \Tracy\Debugger as TracyDebugger;
 
 /**
  * Class Debugger
diff --git a/system/src/Grav/Common/Errors/Errors.php b/system/src/Grav/Common/Errors/Errors.php
index bd03455b0..e135e6f7a 100644
--- a/system/src/Grav/Common/Errors/Errors.php
+++ b/system/src/Grav/Common/Errors/Errors.php
@@ -4,9 +4,6 @@ namespace Grav\Common\Errors;
 use Grav\Common\Grav;
 use Whoops\Handler\CallbackHandler;
 use Whoops\Handler\HandlerInterface;
-use Whoops\Handler\JsonResponseHandler;
-use Whoops\Handler\PrettyPageHandler;
-use Whoops\Handler\PlainTextHandler;
 use Whoops\Run;
 
 /**
diff --git a/system/src/Grav/Common/GPM/Upgrader.php b/system/src/Grav/Common/GPM/Upgrader.php
index 7d1adeffc..413665144 100644
--- a/system/src/Grav/Common/GPM/Upgrader.php
+++ b/system/src/Grav/Common/GPM/Upgrader.php
@@ -1,9 +1,6 @@
 <?php
 namespace Grav\Common\GPM;
 
-use Grav\Common\Filesystem\Folder;
-use Grav\Common\GPM\Installer;
-
 class Upgrader
 {
     /**
diff --git a/system/src/Grav/Common/Plugin.php b/system/src/Grav/Common/Plugin.php
index ea000c247..be6f3aa25 100644
--- a/system/src/Grav/Common/Plugin.php
+++ b/system/src/Grav/Common/Plugin.php
@@ -1,7 +1,6 @@
 <?php
 namespace Grav\Common;
 
-use Grav\Common\Inflector;
 use Grav\Common\Data\Data;
 use Grav\Common\Page\Page;
 use Grav\Common\Config\Config;
diff --git a/system/src/Grav/Common/Service/ConfigServiceProvider.php b/system/src/Grav/Common/Service/ConfigServiceProvider.php
index ce6b76fa0..c66732b08 100644
--- a/system/src/Grav/Common/Service/ConfigServiceProvider.php
+++ b/system/src/Grav/Common/Service/ConfigServiceProvider.php
@@ -2,9 +2,6 @@
 namespace Grav\Common\Service;
 
 use Grav\Common\Config\Config;
-use Grav\Common\Grav;
-use Grav\Common\Uri;
-use Grav\Common\Filesystem\Folder;
 use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use RocketTheme\Toolbox\Blueprints\Blueprints;
diff --git a/system/src/Grav/Common/Service/ErrorServiceProvider.php b/system/src/Grav/Common/Service/ErrorServiceProvider.php
index 3f3609729..66453e34d 100644
--- a/system/src/Grav/Common/Service/ErrorServiceProvider.php
+++ b/system/src/Grav/Common/Service/ErrorServiceProvider.php
@@ -7,7 +7,6 @@ use Pimple\ServiceProviderInterface;
 use Whoops\Handler\JsonResponseHandler;
 use Whoops\Handler\PrettyPageHandler;
 use Whoops\Handler\PlainTextHandler;
-use Whoops\Run;
 
 class ErrorServiceProvider implements ServiceProviderInterface
 {
diff --git a/system/src/Grav/Common/Service/LoggerServiceProvider.php b/system/src/Grav/Common/Service/LoggerServiceProvider.php
index 7f4e46c27..cdbab4277 100644
--- a/system/src/Grav/Common/Service/LoggerServiceProvider.php
+++ b/system/src/Grav/Common/Service/LoggerServiceProvider.php
@@ -5,7 +5,6 @@ use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use \Monolog\Logger;
 use \Monolog\Handler\StreamHandler;
-use \Monolog\Handler\RotatingFileHandler;
 
 class LoggerServiceProvider implements ServiceProviderInterface
 {
diff --git a/system/src/Grav/Console/Cli/BackupCommand.php b/system/src/Grav/Console/Cli/BackupCommand.php
index 4f7194b0a..050301762 100644
--- a/system/src/Grav/Console/Cli/BackupCommand.php
+++ b/system/src/Grav/Console/Cli/BackupCommand.php
@@ -6,9 +6,7 @@ use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Class BackupCommand
diff --git a/system/src/Grav/Console/Cli/CleanCommand.php b/system/src/Grav/Console/Cli/CleanCommand.php
index 94a644450..749b7c5e8 100644
--- a/system/src/Grav/Console/Cli/CleanCommand.php
+++ b/system/src/Grav/Console/Cli/CleanCommand.php
@@ -4,9 +4,7 @@ namespace Grav\Console\Cli;
 use Grav\Common\Filesystem\Folder;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/system/src/Grav/Console/Cli/ClearCacheCommand.php b/system/src/Grav/Console/Cli/ClearCacheCommand.php
index de48ca0d0..e565671e9 100644
--- a/system/src/Grav/Console/Cli/ClearCacheCommand.php
+++ b/system/src/Grav/Console/Cli/ClearCacheCommand.php
@@ -1,16 +1,12 @@
 <?php
 namespace Grav\Console\Cli;
 
-use Grav\Console\ConsoleTrait;
 use Grav\Common\Cache;
-use Grav\Common\Filesystem\Folder;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Class ClearCacheCommand
diff --git a/system/src/Grav/Console/Cli/NewProjectCommand.php b/system/src/Grav/Console/Cli/NewProjectCommand.php
index 021e8f9bb..708b01901 100644
--- a/system/src/Grav/Console/Cli/NewProjectCommand.php
+++ b/system/src/Grav/Console/Cli/NewProjectCommand.php
@@ -2,13 +2,11 @@
 namespace Grav\Console\Cli;
 
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Yaml\Yaml;
 
 /**
  * Class NewProjectCommand