From 05ad779cfd56f04e579173b68742a62ce795596c Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Fri, 9 May 2014 18:37:09 +1200
Subject: [PATCH] Removed unused imports in core/ and plugins/ using phpstorm
 optimize imports feature

---
 core/API/DataTableGenericFilter.php                  |  2 +-
 core/API/DataTableManipulator.php                    |  2 +-
 core/API/DataTableManipulator/Flattener.php          |  2 +-
 core/API/DataTableManipulator/LabelFilter.php        |  2 +-
 .../DataTableManipulator/ReportTotalsCalculator.php  |  5 +----
 core/API/ResponseBuilder.php                         |  2 +-
 core/Access.php                                      |  1 -
 core/Archive.php                                     |  2 --
 core/Archive/Parameters.php                          |  1 -
 core/ArchiveProcessor.php                            |  1 -
 core/ArchiveProcessor/PluginsArchiver.php            |  1 -
 core/ArchiveProcessor/Rules.php                      |  2 --
 core/AssetManager.php                                |  6 +++---
 core/AssetManager/UIAssetMerger.php                  |  2 +-
 .../UIAssetMerger/JScriptUIAssetMerger.php           |  2 +-
 .../UIAssetMerger/StylesheetUIAssetMerger.php        |  2 +-
 core/AssetManager/UIAssetMinifier.php                |  2 +-
 core/CliMulti/RequestCommand.php                     |  4 +---
 core/Common.php                                      |  2 +-
 core/Console.php                                     |  4 ++--
 core/DataAccess/ArchiveSelector.php                  |  6 ++----
 core/DataAccess/ArchiveWriter.php                    |  7 +------
 core/DataAccess/LogAggregator.php                    |  3 ---
 core/DataTable.php                                   |  3 +--
 core/DataTable/Bridges.php                           |  2 +-
 core/DataTable/Filter/AddColumnsProcessedMetrics.php |  2 +-
 core/DataTable/Filter/ReplaceColumnNames.php         |  2 +-
 core/DataTable/Filter/ReplaceSummaryRowLabel.php     |  2 +-
 core/DataTable/Filter/Sort.php                       |  2 +-
 core/DataTable/Filter/Truncate.php                   |  2 +-
 core/DataTable/Map.php                               |  2 +-
 core/DataTable/Renderer/Csv.php                      |  2 +-
 core/DataTable/Renderer/Html.php                     |  2 +-
 core/DataTable/Renderer/Php.php                      |  2 +-
 core/DataTable/Renderer/Rss.php                      |  3 +--
 core/DataTable/Row.php                               |  1 -
 core/Db/BatchInsert.php                              |  1 -
 core/Period.php                                      |  5 -----
 core/Piwik.php                                       |  3 +--
 core/Plugin/ConsoleCommand.php                       |  2 +-
 core/Plugin/Controller.php                           |  8 ++++----
 core/Plugin/ControllerAdmin.php                      |  4 ++--
 core/Plugin/Dependency.php                           |  3 ++-
 core/Plugin/Manager.php                              |  3 +--
 core/Plugin/ViewDataTable.php                        |  3 +--
 core/ReportRenderer.php                              |  2 +-
 core/ReportRenderer/Csv.php                          |  4 ++--
 core/Tracker.php                                     |  2 +-
 core/Tracker/ActionPageview.php                      |  1 -
 core/Tracker/Cache.php                               |  1 -
 core/Tracker/Db/Pdo/Mysql.php                        |  2 +-
 core/Tracker/Visit.php                               |  2 +-
 core/Twig.php                                        |  2 +-
 core/Updates/2.0.3-b7.php                            |  6 +-----
 core/Updates/2.0.4-b5.php                            |  2 +-
 core/Updates/2.0.4-b7.php                            |  6 +-----
 core/Updates/2.0.4-b8.php                            |  6 +++---
 core/Updates/2.1.1-b11.php                           | 12 ++++++------
 core/Updates/2.2.0-b15.php                           |  1 -
 core/View.php                                        |  1 -
 core/View/RenderTokenParser.php                      |  7 +++----
 core/View/UIControl.php                              |  2 +-
 core/dispatch.php                                    |  2 +-
 plugins/API/API.php                                  |  4 ++--
 plugins/API/ProcessedReport.php                      |  2 +-
 plugins/API/RowEvolution.php                         |  4 ++--
 plugins/Actions/ArchivingHelper.php                  |  4 ++--
 plugins/Actions/Controller.php                       |  1 -
 plugins/Annotations/API.php                          |  3 +--
 plugins/CoreAdminHome/API.php                        |  5 +----
 plugins/CoreAdminHome/Controller.php                 |  1 -
 plugins/CoreConsole/Commands/GenerateCommand.php     |  1 -
 plugins/CoreConsole/Commands/ManagePlugin.php        |  2 +-
 plugins/CoreConsole/Commands/SetupFixture.php        |  5 ++---
 plugins/CoreHome/Controller.php                      |  3 +--
 plugins/CorePluginsAdmin/Controller.php              |  4 ++--
 plugins/CorePluginsAdmin/CorePluginsAdmin.php        |  1 -
 plugins/CorePluginsAdmin/PluginInstaller.php         |  2 +-
 plugins/CoreUpdater/Controller.php                   |  4 ++--
 plugins/CoreUpdater/CoreUpdater.php                  |  2 +-
 plugins/CoreUpdater/UpdateCommunication.php          |  2 +-
 plugins/CoreVisualizations/JqplotDataGenerator.php   |  1 -
 .../CoreVisualizations/JqplotDataGenerator/Chart.php |  1 -
 plugins/CoreVisualizations/Visualizations/Graph.php  |  2 +-
 .../CoreVisualizations/Visualizations/HtmlTable.php  |  6 +++---
 plugins/CustomVariables/Archiver.php                 |  2 +-
 .../Commands/SetNumberOfCustomVariables.php          |  2 +-
 plugins/CustomVariables/Controller.php               |  1 -
 plugins/CustomVariables/CustomVariables.php          |  2 +-
 plugins/CustomVariables/tests/Commands/InfoTest.php  |  2 +-
 .../Commands/SetNumberOfCustomVariablesTest.php      |  2 +-
 .../tests/CustomVariablesIntegrationTest.php         |  2 --
 plugins/DBStats/Controller.php                       |  1 -
 plugins/DBStats/DBStats.php                          |  1 -
 plugins/DBStats/MySQLMetadataDataAccess.php          |  4 ++--
 plugins/DBStats/MySQLMetadataProvider.php            |  1 -
 plugins/DBStats/tests/Mocks/MockDataAccess.php       |  1 -
 plugins/Dashboard/DashboardManagerControl.php        |  2 --
 plugins/DevicesDetection/Controller.php              |  3 +--
 plugins/DevicesDetection/DevicesDetection.php        |  4 +---
 plugins/DevicesDetection/functions.php               |  2 +-
 plugins/Events/API.php                               |  2 +-
 plugins/Events/Controller.php                        |  3 ---
 plugins/ExampleAPI/API.php                           |  2 +-
 plugins/Feedback/Controller.php                      |  8 --------
 plugins/Goals/Controller.php                         |  5 ++---
 plugins/Goals/Goals.php                              |  1 -
 plugins/ImageGraph/StaticGraph.php                   |  1 -
 plugins/Insights/API.php                             |  7 +------
 plugins/Insights/DataTable/Filter/MinGrowth.php      |  2 +-
 plugins/Insights/Model.php                           |  2 +-
 plugins/Insights/Visualizations/Insight.php          |  2 --
 plugins/Insights/tests/ApiTest.php                   |  4 ++--
 .../Fixtures/SomeVisitsDifferentPathsOnTwoDays.php   |  1 +
 plugins/Insights/tests/InsightReportTest.php         |  2 +-
 plugins/Installation/Controller.php                  |  2 +-
 plugins/Installation/FormDatabaseSetup.php           |  2 +-
 plugins/Installation/SystemCheck.php                 |  3 +--
 plugins/LanguagesManager/Commands/CreatePull.php     |  1 -
 plugins/LanguagesManager/Controller.php              |  1 -
 plugins/LanguagesManager/LanguagesManager.php        |  1 -
 plugins/Live/API.php                                 |  4 ++--
 plugins/Live/Controller.php                          |  1 -
 plugins/Live/Visitor.php                             |  2 +-
 plugins/Login/Controller.php                         |  1 -
 plugins/MultiSites/API.php                           |  1 -
 plugins/MultiSites/Controller.php                    |  4 ----
 plugins/PrivacyManager/PrivacyManager.php            |  3 +--
 plugins/Provider/Controller.php                      |  2 --
 plugins/Provider/Provider.php                        |  2 --
 plugins/Referrers/Controller.php                     |  2 --
 plugins/Referrers/Referrers.php                      |  2 +-
 plugins/SEO/RankChecker.php                          |  1 -
 plugins/ScheduledReports/API.php                     |  2 +-
 plugins/ScheduledReports/ScheduledReports.php        |  2 --
 plugins/SegmentEditor/Model.php                      |  4 ----
 plugins/SegmentEditor/SegmentEditor.php              |  3 ---
 plugins/SitesManager/API.php                         |  2 +-
 plugins/SitesManager/Controller.php                  |  3 ---
 plugins/Transitions/API.php                          |  2 +-
 plugins/UserCountry/API.php                          |  1 -
 plugins/UserCountry/Controller.php                   |  7 +++----
 plugins/UserCountry/GeoIPAutoUpdater.php             |  4 ++--
 .../LocationProvider/GeoIp/ServerBased.php           |  2 +-
 plugins/UserCountry/UserCountry.php                  |  6 +++---
 plugins/UserSettings/Controller.php                  |  1 -
 plugins/UsersManager/Controller.php                  |  4 ++--
 plugins/UsersManager/LastSeenTimeLogger.php          |  2 +-
 plugins/VisitFrequency/API.php                       |  6 ++----
 plugins/VisitTime/Controller.php                     |  1 -
 plugins/VisitTime/VisitTime.php                      |  1 -
 plugins/VisitorInterest/Controller.php               |  1 -
 plugins/VisitsSummary/Controller.php                 |  2 +-
 153 files changed, 139 insertions(+), 269 deletions(-)

diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php
index 6b24e00c6a..d540b750f3 100644
--- a/core/API/DataTableGenericFilter.php
+++ b/core/API/DataTableGenericFilter.php
@@ -10,8 +10,8 @@ namespace Piwik\API;
 
 use Exception;
 use Piwik\Common;
-use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
 use Piwik\DataTable;
+use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
 
 class DataTableGenericFilter
 {
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 5ebdd2fbcf..0c19cc844a 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -11,8 +11,8 @@ namespace Piwik\API;
 use Exception;
 use Piwik\Archive\DataTableFactory;
 use Piwik\Common;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Period\Range;
 use Piwik\Plugins\API\API;
 
diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
index 20fe2c028f..9d1d53d089 100644
--- a/core/API/DataTableManipulator/Flattener.php
+++ b/core/API/DataTableManipulator/Flattener.php
@@ -10,8 +10,8 @@ namespace Piwik\API\DataTableManipulator;
 
 use Piwik\API\DataTableManipulator;
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 
 /**
  * This class is responsible for flattening data tables.
diff --git a/core/API/DataTableManipulator/LabelFilter.php b/core/API/DataTableManipulator/LabelFilter.php
index 05c594b35a..c2075b1efe 100644
--- a/core/API/DataTableManipulator/LabelFilter.php
+++ b/core/API/DataTableManipulator/LabelFilter.php
@@ -10,8 +10,8 @@ namespace Piwik\API\DataTableManipulator;
 
 use Piwik\API\DataTableManipulator;
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 
 /**
  * This class is responsible for handling the label parameter that can be
diff --git a/core/API/DataTableManipulator/ReportTotalsCalculator.php b/core/API/DataTableManipulator/ReportTotalsCalculator.php
index ee289d8ba8..a0b336ffd8 100644
--- a/core/API/DataTableManipulator/ReportTotalsCalculator.php
+++ b/core/API/DataTableManipulator/ReportTotalsCalculator.php
@@ -11,11 +11,8 @@ namespace Piwik\API\DataTableManipulator;
 use Piwik\API\DataTableManipulator;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\DataTable\BaseFilter;
-use Piwik\Period\Range;
-use Piwik\Period;
-use Piwik\Piwik;
 use Piwik\Metrics;
+use Piwik\Period;
 use Piwik\Plugins\API\API;
 
 /**
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 692a2ceb71..255944bdbe 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -13,10 +13,10 @@ use Piwik\API\DataTableManipulator\Flattener;
 use Piwik\API\DataTableManipulator\LabelFilter;
 use Piwik\API\DataTableManipulator\ReportTotalsCalculator;
 use Piwik\Common;
+use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Json;
 use Piwik\DataTable\Renderer;
 use Piwik\DataTable\Simple;
-use Piwik\DataTable;
 
 /**
  */
diff --git a/core/Access.php b/core/Access.php
index 71a5dd5f33..a858765c1f 100644
--- a/core/Access.php
+++ b/core/Access.php
@@ -9,7 +9,6 @@
 namespace Piwik;
 
 use Piwik\Db;
-use Piwik\Plugins\UsersManager\API as APIUsersManager;
 
 /**
  * Singleton that manages user access to Piwik resources.
diff --git a/core/Archive.php b/core/Archive.php
index a271f40905..431b5e818f 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -9,10 +9,8 @@
 namespace Piwik;
 
 use Piwik\Archive\Parameters;
-
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\DataAccess\ArchiveSelector;
-use Piwik\Period\Range;
 use Piwik\Period\Factory;
 
 /**
diff --git a/core/Archive/Parameters.php b/core/Archive/Parameters.php
index 1f700819ee..a8d769b098 100644
--- a/core/Archive/Parameters.php
+++ b/core/Archive/Parameters.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Archive;
 
-use Exception;
 use Piwik\Period;
 use Piwik\Segment;
 
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index b3383e5ce2..1a5fec8a7d 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -10,7 +10,6 @@ namespace Piwik;
 
 use Exception;
 use Piwik\ArchiveProcessor\Parameters;
-
 use Piwik\DataAccess\ArchiveWriter;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataTable\Manager;
diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
index 82f361f702..8d3703c522 100644
--- a/core/ArchiveProcessor/PluginsArchiver.php
+++ b/core/ArchiveProcessor/PluginsArchiver.php
@@ -11,7 +11,6 @@ namespace Piwik\ArchiveProcessor;
 
 use Piwik\Archive;
 use Piwik\ArchiveProcessor;
-use Piwik\DataAccess\ArchiveSelector;
 use Piwik\DataAccess\ArchiveWriter;
 use Piwik\DataTable\Manager;
 use Piwik\Metrics;
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 6bcd5fbd87..45250b0d23 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -9,14 +9,12 @@
 namespace Piwik\ArchiveProcessor;
 
 use Exception;
-use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
 use Piwik\Log;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreAdminHome\Controller;
-use Piwik\Plugins\CoreAdminHome\CoreAdminHome;
 use Piwik\Segment;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
diff --git a/core/AssetManager.php b/core/AssetManager.php
index 972c84c37f..8df4be83dd 100644
--- a/core/AssetManager.php
+++ b/core/AssetManager.php
@@ -9,19 +9,19 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAsset\InMemoryUIAsset;
 use Piwik\AssetManager\UIAsset\OnDiskUIAsset;
+use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAssetCacheBuster;
+use Piwik\AssetManager\UIAssetFetcher;
 use Piwik\AssetManager\UIAssetFetcher\JScriptUIAssetFetcher;
 use Piwik\AssetManager\UIAssetFetcher\StaticUIAssetFetcher;
 use Piwik\AssetManager\UIAssetFetcher\StylesheetUIAssetFetcher;
-use Piwik\AssetManager\UIAssetFetcher;
 use Piwik\AssetManager\UIAssetMerger\JScriptUIAssetMerger;
 use Piwik\AssetManager\UIAssetMerger\StylesheetUIAssetMerger;
+use Piwik\Config as PiwikConfig;
 use Piwik\Plugin\Manager;
 use Piwik\Translate;
-use Piwik\Config as PiwikConfig;
 
 /**
  * AssetManager is the class used to manage the inclusion of UI assets:
diff --git a/core/AssetManager/UIAssetMerger.php b/core/AssetManager/UIAssetMerger.php
index fd98da9072..8ac12365fc 100644
--- a/core/AssetManager/UIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\AssetManager;
 
+use Piwik\AssetManager;
 use Piwik\AssetManager\PiwikLessCompiler;
 use Piwik\AssetManager\UIAsset\StylesheetUIAsset;
-use Piwik\AssetManager;
 
 abstract class UIAssetMerger
 {
diff --git a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
index 93b7d7bf6d..3cd57f11d0 100644
--- a/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/JScriptUIAssetMerger.php
@@ -10,9 +10,9 @@ namespace Piwik\AssetManager\UIAssetMerger;
 
 use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAssetCacheBuster;
+use Piwik\AssetManager;
 use Piwik\AssetManager\UIAssetFetcher\JScriptUIAssetFetcher;
 use Piwik\AssetManager\UIAssetMerger;
-use Piwik\AssetManager;
 use Piwik\AssetManager\UIAssetMinifier;
 use Piwik\Piwik;
 
diff --git a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
index 52c21c9447..a5ebe11921 100644
--- a/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
+++ b/core/AssetManager/UIAssetMerger/StylesheetUIAssetMerger.php
@@ -9,10 +9,10 @@
 namespace Piwik\AssetManager\UIAssetMerger;
 
 use Exception;
+use lessc;
 use Piwik\AssetManager\UIAsset;
 use Piwik\AssetManager\UIAssetMerger;
 use Piwik\Piwik;
-use lessc;
 
 class StylesheetUIAssetMerger extends UIAssetMerger
 {
diff --git a/core/AssetManager/UIAssetMinifier.php b/core/AssetManager/UIAssetMinifier.php
index 34006f5a32..4388ecaaa9 100644
--- a/core/AssetManager/UIAssetMinifier.php
+++ b/core/AssetManager/UIAssetMinifier.php
@@ -10,8 +10,8 @@
 namespace Piwik\AssetManager;
 
 use Exception;
-use Piwik\Singleton;
 use JShrink\Minifier;
+use Piwik\Singleton;
 
 class UIAssetMinifier extends Singleton
 {
diff --git a/core/CliMulti/RequestCommand.php b/core/CliMulti/RequestCommand.php
index f6ccfd3454..253102db88 100644
--- a/core/CliMulti/RequestCommand.php
+++ b/core/CliMulti/RequestCommand.php
@@ -8,6 +8,7 @@
 
 namespace Piwik\CliMulti;
 
+use Piwik\Config;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Url;
 use Piwik\UrlHelper;
@@ -15,9 +16,6 @@ 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 Piwik\Config;
-use Piwik\Common;
-use Piwik\FrontController;
 
 /**
  * RequestCommand
diff --git a/core/Common.php b/core/Common.php
index 876f6ff8e8..907877b400 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -10,8 +10,8 @@ namespace Piwik;
 
 use Exception;
 use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
-use Piwik\Tracker;
 use Piwik\Tracker\Cache;
+use Piwik\Tracker;
 
 /**
  * Contains helper methods used by both Piwik Core and the Piwik Tracking engine.
diff --git a/core/Console.php b/core/Console.php
index cdeb6a087d..6f32eb8f33 100644
--- a/core/Console.php
+++ b/core/Console.php
@@ -8,12 +8,12 @@
  */
 namespace Piwik;
 
+use Piwik\Plugin\Manager as PluginManager;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
-use Piwik\Plugin\Manager as PluginManager;
 
 class Console extends Application
 {
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index 4ba9b21b01..c24c0fb52a 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -9,18 +9,16 @@
 namespace Piwik\DataAccess;
 
 use Exception;
-use Piwik\ArchiveProcessor\Rules;
 use Piwik\ArchiveProcessor;
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Log;
-
-use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Segment;
-use Piwik\Site;
 
 /**
  * Data Access object used to query archives
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index 8c54dd52b0..1563a639c9 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -9,17 +9,12 @@
 namespace Piwik\DataAccess;
 
 use Exception;
-use Piwik\ArchiveProcessor\Rules;
 use Piwik\ArchiveProcessor;
+use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
-
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\Db\BatchInsert;
-use Piwik\Log;
 use Piwik\Period;
-use Piwik\Segment;
-use Piwik\SettingsPiwik;
 
 /**
  * This class is used to create a new Archive.
diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
index f3a3a740cb..9c330715c0 100644
--- a/core/DataAccess/LogAggregator.php
+++ b/core/DataAccess/LogAggregator.php
@@ -8,12 +8,9 @@
  */
 namespace Piwik\DataAccess;
 
-use PDOStatement;
 use Piwik\ArchiveProcessor\Parameters;
-use Piwik\Common;
 use Piwik\DataArray;
 use Piwik\Db;
-
 use Piwik\Metrics;
 use Piwik\Tracker\GoalManager;
 
diff --git a/core/DataTable.php b/core/DataTable.php
index 6d75b5f71b..0fa7e67ef1 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -12,11 +12,10 @@ namespace Piwik;
 use Closure;
 use Exception;
 use Piwik\DataTable\DataTableInterface;
-use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Html;
-use Piwik\DataTable\Row;
 use Piwik\DataTable\Row\DataTableSummaryRow;
+use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable\TableNotFoundException;
 use ReflectionClass;
diff --git a/core/DataTable/Bridges.php b/core/DataTable/Bridges.php
index cf924e03e9..c2b2467d72 100644
--- a/core/DataTable/Bridges.php
+++ b/core/DataTable/Bridges.php
@@ -13,8 +13,8 @@
  */
 namespace {
 
-    use Piwik\DataTable\Row\DataTableSummaryRow;
     use Piwik\DataTable\Row;
+    use Piwik\DataTable\Row\DataTableSummaryRow;
 
     class Piwik_DataTable_Row_DataTableSummary extends DataTableSummaryRow
     {
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index cd6629f8b0..e60d3fa6af 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Metrics;
 
 /**
diff --git a/core/DataTable/Filter/ReplaceColumnNames.php b/core/DataTable/Filter/ReplaceColumnNames.php
index fd842ad0ff..2417aa9dd6 100644
--- a/core/DataTable/Filter/ReplaceColumnNames.php
+++ b/core/DataTable/Filter/ReplaceColumnNames.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\DataTable\Filter;
 
+use Piwik\DataTable;
 use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Simple;
-use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Tracker\GoalManager;
diff --git a/core/DataTable/Filter/ReplaceSummaryRowLabel.php b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
index b89a306a1a..f3c9e97992 100644
--- a/core/DataTable/Filter/ReplaceSummaryRowLabel.php
+++ b/core/DataTable/Filter/ReplaceSummaryRowLabel.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\Piwik;
 
 /**
diff --git a/core/DataTable/Filter/Sort.php b/core/DataTable/Filter/Sort.php
index fbef2d91b9..7050a3eb7b 100644
--- a/core/DataTable/Filter/Sort.php
+++ b/core/DataTable/Filter/Sort.php
@@ -9,9 +9,9 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
-use Piwik\DataTable;
 use Piwik\Metrics;
 
 /**
diff --git a/core/DataTable/Filter/Truncate.php b/core/DataTable/Filter/Truncate.php
index fa5389650b..651a3f7564 100644
--- a/core/DataTable/Filter/Truncate.php
+++ b/core/DataTable/Filter/Truncate.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Filter;
 
 use Piwik\DataTable\BaseFilter;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Piwik;
 
 /**
diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php
index 7985afb1d8..51355af56c 100644
--- a/core/DataTable/Map.php
+++ b/core/DataTable/Map.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable;
 
 use Piwik\Common;
-use Piwik\DataTable;
 use Piwik\DataTable\Renderer\Console;
+use Piwik\DataTable;
 
 /**
  * Stores an array of {@link DataTable}s indexed by one type of {@link DataTable} metadata (such as site ID
diff --git a/core/DataTable/Renderer/Csv.php b/core/DataTable/Renderer/Csv.php
index 75d6d68fc0..58ef0f156a 100644
--- a/core/DataTable/Renderer/Csv.php
+++ b/core/DataTable/Renderer/Csv.php
@@ -13,8 +13,8 @@ use Piwik\DataTable\Renderer;
 use Piwik\DataTable\Simple;
 use Piwik\DataTable;
 use Piwik\Date;
-use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\ProxyHttp;
 
diff --git a/core/DataTable/Renderer/Html.php b/core/DataTable/Renderer/Html.php
index ca4cd653ee..931831b333 100644
--- a/core/DataTable/Renderer/Html.php
+++ b/core/DataTable/Renderer/Html.php
@@ -9,8 +9,8 @@
 namespace Piwik\DataTable\Renderer;
 
 use Exception;
-use Piwik\DataTable;
 use Piwik\DataTable\Renderer;
+use Piwik\DataTable;
 
 /**
  * Simple HTML output
diff --git a/core/DataTable/Renderer/Php.php b/core/DataTable/Renderer/Php.php
index 80e49bc22d..cbc71a038c 100644
--- a/core/DataTable/Renderer/Php.php
+++ b/core/DataTable/Renderer/Php.php
@@ -10,9 +10,9 @@ namespace Piwik\DataTable\Renderer;
 
 use Exception;
 use Piwik\DataTable\Manager;
+use Piwik\DataTable;
 use Piwik\DataTable\Renderer;
 use Piwik\DataTable\Simple;
-use Piwik\DataTable;
 use Piwik\Piwik;
 
 /**
diff --git a/core/DataTable/Renderer/Rss.php b/core/DataTable/Renderer/Rss.php
index 2c07e00bb8..c23594c3eb 100644
--- a/core/DataTable/Renderer/Rss.php
+++ b/core/DataTable/Renderer/Rss.php
@@ -11,11 +11,10 @@ namespace Piwik\DataTable\Renderer;
 use Exception;
 use Piwik\Archive;
 use Piwik\Common;
-use Piwik\DataTable\Renderer;
 use Piwik\DataTable;
+use Piwik\DataTable\Renderer;
 use Piwik\Date;
 use Piwik\SettingsPiwik;
-use Piwik\Url;
 
 /**
  * RSS Feed.
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index 8837458073..f7934c7e31 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -10,7 +10,6 @@ namespace Piwik\DataTable;
 
 use Exception;
 use Piwik\DataTable;
-use Piwik\Log;
 use Piwik\Metrics;
 
 /**
diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php
index 76928a21b3..659954d06a 100644
--- a/core/Db/BatchInsert.php
+++ b/core/Db/BatchInsert.php
@@ -12,7 +12,6 @@ use Exception;
 use Piwik\AssetManager;
 use Piwik\Common;
 use Piwik\Config;
-
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Log;
diff --git a/core/Period.php b/core/Period.php
index 9fc808e13d..66d7aa7c65 100644
--- a/core/Period.php
+++ b/core/Period.php
@@ -8,12 +8,7 @@
  */
 namespace Piwik;
 
-use Exception;
-use Piwik\Period\Day;
 use Piwik\Period\Factory;
-use Piwik\Period\Month;
-use Piwik\Period\Week;
-use Piwik\Period\Year;
 use Piwik\Period\Range;
 
 /**
diff --git a/core/Piwik.php b/core/Piwik.php
index 95abfe784c..be3193b344 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -9,10 +9,9 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Db;
 use Piwik\Db\Adapter;
-
 use Piwik\Db\Schema;
-use Piwik\Db;
 use Piwik\Plugin;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
diff --git a/core/Plugin/ConsoleCommand.php b/core/Plugin/ConsoleCommand.php
index ede6952f73..1d9a62696a 100644
--- a/core/Plugin/ConsoleCommand.php
+++ b/core/Plugin/ConsoleCommand.php
@@ -10,8 +10,8 @@ namespace Piwik\Plugin;
 
 use Piwik\Common;
 use Symfony\Component\Console\Command\Command as SymfonyCommand;
-use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * The base class for console commands.
diff --git a/core/Plugin/Controller.php b/core/Plugin/Controller.php
index 3e6d4a8e11..bf140e0b56 100644
--- a/core/Plugin/Controller.php
+++ b/core/Plugin/Controller.php
@@ -13,17 +13,17 @@ use Piwik\Access;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\Config as PiwikConfig;
 use Piwik\Config;
+use Piwik\Config as PiwikConfig;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\Date;
 use Piwik\FrontController;
 use Piwik\Menu\MenuTop;
 use Piwik\NoAccessException;
 use Piwik\Notification\Manager as NotificationManager;
-use Piwik\Period\Month;
-use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Period;
+use Piwik\Period\Month;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution;
@@ -34,8 +34,8 @@ use Piwik\Registry;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\Url;
-use Piwik\View;
 use Piwik\View\ViewInterface;
+use Piwik\View;
 use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
 
 /**
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 56051341ab..4574865238 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -8,12 +8,12 @@
  */
 namespace Piwik\Plugin;
 
-use Piwik\Config as PiwikConfig;
 use Piwik\Config;
+use Piwik\Config as PiwikConfig;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
-use Piwik\Notification;
 use Piwik\Notification\Manager as NotificationManager;
+use Piwik\Notification;
 use Piwik\Piwik;
 use Piwik\Url;
 use Piwik\Version;
diff --git a/core/Plugin/Dependency.php b/core/Plugin/Dependency.php
index 0448f8a721..4e5a574966 100644
--- a/core/Plugin/Dependency.php
+++ b/core/Plugin/Dependency.php
@@ -8,8 +8,9 @@
  */
 namespace Piwik\Plugin;
 
-use Piwik\Version;
 use Piwik\Plugin\Manager as PluginManager;
+use Piwik\Version;
+
 /**
  *
  */
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index 5816bd3321..047464551c 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -10,13 +10,12 @@
 namespace Piwik\Plugin;
 
 use Piwik\Common;
-use Piwik\Config as PiwikConfig;
 use Piwik\Config;
+use Piwik\Config as PiwikConfig;
 use Piwik\EventDispatcher;
 use Piwik\Filesystem;
 use Piwik\Option;
 use Piwik\Plugin;
-use Piwik\SettingsServer;
 use Piwik\Singleton;
 use Piwik\Theme;
 use Piwik\Tracker;
diff --git a/core/Plugin/ViewDataTable.php b/core/Plugin/ViewDataTable.php
index c49aef59ba..f6d4365ea6 100644
--- a/core/Plugin/ViewDataTable.php
+++ b/core/Plugin/ViewDataTable.php
@@ -11,11 +11,10 @@ namespace Piwik\Plugin;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\DataTable;
-use Piwik\Option;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\View;
 use Piwik\View\ViewInterface;
+use Piwik\View;
 use Piwik\ViewDataTable\Config as VizConfig;
 use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 use Piwik\ViewDataTable\Request as ViewDataTableRequest;
diff --git a/core/ReportRenderer.php b/core/ReportRenderer.php
index 4634f9197c..8105b98d75 100644
--- a/core/ReportRenderer.php
+++ b/core/ReportRenderer.php
@@ -11,8 +11,8 @@ namespace Piwik;
 use Exception;
 use Piwik\API\Request;
 use Piwik\DataTable\Row;
-use Piwik\DataTable\Simple;
 use Piwik\DataTable;
+use Piwik\DataTable\Simple;
 use Piwik\Plugins\ImageGraph\API;
 
 /**
diff --git a/core/ReportRenderer/Csv.php b/core/ReportRenderer/Csv.php
index 7791501539..6262a1cd6d 100644
--- a/core/ReportRenderer/Csv.php
+++ b/core/ReportRenderer/Csv.php
@@ -1,10 +1,10 @@
 <?php
 namespace Piwik\ReportRenderer;
 
+use Piwik\DataTable\DataTableInterface;
+use Piwik\DataTable\Renderer\Csv as CsvDataTableRenderer;
 use Piwik\Piwik;
 use Piwik\ReportRenderer;
-use Piwik\DataTable\Renderer\Csv as CsvDataTableRenderer;
-use Piwik\DataTable\DataTableInterface;
 
 class Csv extends ReportRenderer
 {
diff --git a/core/Tracker.php b/core/Tracker.php
index cac2ec14f7..603380dc9b 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -9,6 +9,7 @@
 namespace Piwik;
 
 use Exception;
+use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
 use Piwik\Tracker\Cache;
 use Piwik\Tracker\Db\DbException;
 use Piwik\Tracker\Db\Mysqli;
@@ -16,7 +17,6 @@ use Piwik\Tracker\Db\Pdo\Mysql;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visit;
 use Piwik\Tracker\VisitInterface;
-use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
 
 /**
  * Class used by the logging script piwik.php called by the javascript tag.
diff --git a/core/Tracker/ActionPageview.php b/core/Tracker/ActionPageview.php
index eae69145e7..35cdb0edac 100644
--- a/core/Tracker/ActionPageview.php
+++ b/core/Tracker/ActionPageview.php
@@ -10,7 +10,6 @@
 namespace Piwik\Tracker;
 
 use Piwik\Config;
-
 use Piwik\Tracker;
 
 /**
diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php
index edf8185d98..1572c7099c 100644
--- a/core/Tracker/Cache.php
+++ b/core/Tracker/Cache.php
@@ -12,7 +12,6 @@ use Piwik\ArchiveProcessor\Rules;
 use Piwik\CacheFile;
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\Log;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Tracker;
diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php
index 3a2e04abfd..eb1fde8400 100644
--- a/core/Tracker/Db/Pdo/Mysql.php
+++ b/core/Tracker/Db/Pdo/Mysql.php
@@ -12,8 +12,8 @@ use Exception;
 use PDO;
 use PDOException;
 use PDOStatement;
-use Piwik\Tracker\Db;
 use Piwik\Tracker\Db\DbException;
+use Piwik\Tracker\Db;
 
 /**
  * PDO MySQL wrapper
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 1cd7d7c9fb..01fde5665f 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -9,13 +9,13 @@
 
 namespace Piwik\Tracker;
 
+use DeviceDetector;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\IP;
 use Piwik\Piwik;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Piwik\Tracker;
-use DeviceDetector;
 
 /**
  * Class used to handle a Visit.
diff --git a/core/Twig.php b/core/Twig.php
index a9b7988b77..6b628c9be7 100755
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -12,8 +12,8 @@ use Exception;
 use Piwik\DataTable\Filter\SafeDecodeLabel;
 use Piwik\Period\Range;
 use Piwik\Translate;
-use Piwik\Visualization\Sparkline;
 use Piwik\View\RenderTokenParser;
+use Piwik\Visualization\Sparkline;
 use Twig_Environment;
 use Twig_Extension_Debug;
 use Twig_Loader_Chain;
diff --git a/core/Updates/2.0.3-b7.php b/core/Updates/2.0.3-b7.php
index 2e9b593a2a..868f9d4e04 100644
--- a/core/Updates/2.0.3-b7.php
+++ b/core/Updates/2.0.3-b7.php
@@ -9,14 +9,10 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Common;
-use Piwik\Site;
-use Piwik\Updater;
-use Piwik\Updates;
 use Piwik\Filesystem;
-
 use Piwik\Plugins\PrivacyManager\DoNotTrackHeaderChecker;
 use Piwik\Plugins\PrivacyManager\IPAnonymizer;
+use Piwik\Updates;
 
 /**
  */
diff --git a/core/Updates/2.0.4-b5.php b/core/Updates/2.0.4-b5.php
index 78c8ab2b54..a146275a49 100644
--- a/core/Updates/2.0.4-b5.php
+++ b/core/Updates/2.0.4-b5.php
@@ -10,13 +10,13 @@
 namespace Piwik\Updates;
 
 use Piwik\Common;
+use Piwik\Config;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 use Piwik\Updater;
 use Piwik\UpdaterErrorException;
 use Piwik\Updates;
-use Piwik\Config;
 
 /**
  */
diff --git a/core/Updates/2.0.4-b7.php b/core/Updates/2.0.4-b7.php
index 83b199033e..50030c2e84 100644
--- a/core/Updates/2.0.4-b7.php
+++ b/core/Updates/2.0.4-b7.php
@@ -9,14 +9,10 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Common;
-use Piwik\Date;
 use Piwik\Db;
 use Piwik\Option;
-use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
-use Piwik\Updater;
-use Piwik\Config;
+use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 use Piwik\UpdaterErrorException;
 use Piwik\Updates;
 
diff --git a/core/Updates/2.0.4-b8.php b/core/Updates/2.0.4-b8.php
index 354ae17ffa..5dbfd95d06 100644
--- a/core/Updates/2.0.4-b8.php
+++ b/core/Updates/2.0.4-b8.php
@@ -9,12 +9,12 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Db;
 use Piwik\Config;
-use Piwik\Updates;
-use Piwik\UpdaterErrorException;
+use Piwik\Db;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use Piwik\UpdaterErrorException;
+use Piwik\Updates;
 
 /**
  */
diff --git a/core/Updates/2.1.1-b11.php b/core/Updates/2.1.1-b11.php
index 4eb924d3d6..3d54546694 100644
--- a/core/Updates/2.1.1-b11.php
+++ b/core/Updates/2.1.1-b11.php
@@ -7,15 +7,15 @@
  */
 namespace Piwik\Updates;
 
-use Piwik\Db;
-use Piwik\Updates;
-use Piwik\Updater;
-use Piwik\Date;
-use Piwik\Segment;
 use Piwik\ArchiveProcessor\Rules;
-use Piwik\Db\BatchInsert;
 use Piwik\DataAccess\ArchiveWriter;
+use Piwik\Date;
+use Piwik\Db;
+use Piwik\Db\BatchInsert;
 use Piwik\Plugins\VisitFrequency\API as VisitFrequencyApi;
+use Piwik\Segment;
+use Piwik\Updater;
+use Piwik\Updates;
 
 /**
  */
diff --git a/core/Updates/2.2.0-b15.php b/core/Updates/2.2.0-b15.php
index 8437a83dbb..82ef7395d8 100644
--- a/core/Updates/2.2.0-b15.php
+++ b/core/Updates/2.2.0-b15.php
@@ -8,7 +8,6 @@
 namespace Piwik\Updates;
 
 use Piwik\Db;
-use Piwik\Filesystem;
 use Piwik\Updates;
 
 /**
diff --git a/core/View.php b/core/View.php
index 69f50d4e0b..8b78482201 100644
--- a/core/View.php
+++ b/core/View.php
@@ -10,7 +10,6 @@ namespace Piwik;
 
 use Exception;
 use Piwik\AssetManager\UIAssetCacheBuster;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
 use Piwik\View\ViewInterface;
 use Twig_Environment;
diff --git a/core/View/RenderTokenParser.php b/core/View/RenderTokenParser.php
index ddb21b9371..6acd3a8fe0 100644
--- a/core/View/RenderTokenParser.php
+++ b/core/View/RenderTokenParser.php
@@ -8,12 +8,11 @@
  */
 namespace Piwik\View;
 
-use Twig_Token;
-use Twig_TokenParser;
-use Twig_Node_Expression_MethodCall;
 use Twig_Node_Expression_Array;
+use Twig_Node_Expression_MethodCall;
 use Twig_Node_Include;
-use Exception;
+use Twig_Token;
+use Twig_TokenParser;
 
 /**
  * Defines a new Twig tag that will render a Piwik View.
diff --git a/core/View/UIControl.php b/core/View/UIControl.php
index 467c5615f3..d0032ade07 100644
--- a/core/View/UIControl.php
+++ b/core/View/UIControl.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\View;
 
-use Piwik\View;
 use Exception;
+use Piwik\View;
 
 /**
  * Base type of UI controls.
diff --git a/core/dispatch.php b/core/dispatch.php
index c8a3769e67..7b5838db58 100644
--- a/core/dispatch.php
+++ b/core/dispatch.php
@@ -11,7 +11,7 @@
 use Piwik\Error;
 use Piwik\ExceptionHandler;
 use Piwik\FrontController;
-use \Piwik\Plugin\ControllerAdmin as PluginControllerAdmin;
+use Piwik\Plugin\ControllerAdmin as PluginControllerAdmin;
 
 PluginControllerAdmin::disableEacceleratorIfEnabled();
 
diff --git a/plugins/API/API.php b/plugins/API/API.php
index bb2d4af630..6d2b0e4e46 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -11,14 +11,14 @@ namespace Piwik\Plugins\API;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Config;
+use Piwik\DataTable;
 use Piwik\DataTable\Filter\ColumnDelete;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Menu\MenuTop;
 use Piwik\Metrics;
-use Piwik\Period\Range;
 use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Tracker\GoalManager;
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 3236500b4b..8ed8931e00 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -12,9 +12,9 @@ use Exception;
 use Piwik\API\Request;
 use Piwik\Archive\DataTableFactory;
 use Piwik\Common;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
-use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Metrics;
 use Piwik\MetricsFormatter;
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index b4ebe24da5..4f203ebf58 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -13,14 +13,14 @@ use Piwik\API\DataTableManipulator\LabelFilter;
 use Piwik\API\Request;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
+use Piwik\DataTable;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\DataTable\Filter\SafeDecodeLabel;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Url;
 use Piwik\Site;
+use Piwik\Url;
 
 /**
  * This class generates a Row evolution dataset, from input request
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index 2ed50efadf..52d5d0c6a0 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -10,10 +10,10 @@ namespace Piwik\Plugins\Actions;
 
 use PDOStatement;
 use Piwik\Config;
+use Piwik\DataTable\Row\DataTableSummaryRow;
+use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
-use Piwik\DataTable\Row\DataTableSummaryRow;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Tracker\Action;
diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php
index af56986a6a..054eff8287 100644
--- a/plugins/Actions/Controller.php
+++ b/plugins/Actions/Controller.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\Actions;
 
 use Piwik\Piwik;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  * Actions controller
diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php
index 605064bbec..418d9be0ec 100755
--- a/plugins/Annotations/API.php
+++ b/plugins/Annotations/API.php
@@ -9,10 +9,9 @@
 namespace Piwik\Plugins\Annotations;
 
 use Exception;
-
 use Piwik\Date;
-use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as EvolutionViz;
 
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index 0c106cbc04..94aa0491ca 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -9,17 +9,14 @@
 namespace Piwik\Plugins\CoreAdminHome;
 
 use Exception;
-use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Option;
-use Piwik\Period;
 use Piwik\Period\Week;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
-use Piwik\Plugins\SitesManager\SitesManager;
-use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\TaskScheduler;
 
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index aadb87bd23..d59557e1b8 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -16,7 +16,6 @@ use Piwik\Config;
 use Piwik\DataTable\Renderer\Json;
 use Piwik\Menu\MenuTop;
 use Piwik\Nonce;
-use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
 use Piwik\Plugins\CustomVariables\CustomVariables;
diff --git a/plugins/CoreConsole/Commands/GenerateCommand.php b/plugins/CoreConsole/Commands/GenerateCommand.php
index d5dee39a61..e52dc3324d 100644
--- a/plugins/CoreConsole/Commands/GenerateCommand.php
+++ b/plugins/CoreConsole/Commands/GenerateCommand.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Plugins\CoreConsole\Commands;
 
-use Piwik\Common;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/CoreConsole/Commands/ManagePlugin.php b/plugins/CoreConsole/Commands/ManagePlugin.php
index cf11128458..1a08945e5e 100644
--- a/plugins/CoreConsole/Commands/ManagePlugin.php
+++ b/plugins/CoreConsole/Commands/ManagePlugin.php
@@ -8,8 +8,8 @@
 
 namespace Piwik\Plugins\CoreConsole\Commands;
 
-use Piwik\Plugin\Manager;
 use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugin\Manager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/CoreConsole/Commands/SetupFixture.php b/plugins/CoreConsole/Commands/SetupFixture.php
index f7e20cbfc3..d1116425bc 100644
--- a/plugins/CoreConsole/Commands/SetupFixture.php
+++ b/plugins/CoreConsole/Commands/SetupFixture.php
@@ -8,13 +8,12 @@
 
 namespace Piwik\Plugins\CoreConsole\Commands;
 
-use Piwik\Url;
-use Piwik\Piwik;
 use Piwik\Config;
 use Piwik\Plugin\ConsoleCommand;
+use Piwik\Url;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index 6db3feec8a..d2610483bb 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -15,9 +15,7 @@ use Piwik\Date;
 use Piwik\FrontController;
 use Piwik\Menu\MenuMain;
 use Piwik\Notification\Manager as NotificationManager;
-use Piwik\Option;
 use Piwik\Piwik;
-use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 use Piwik\Plugins\CoreHome\DataTableRowAction\MultiRowEvolution;
 use Piwik\Plugins\CoreHome\DataTableRowAction\RowEvolution;
 use Piwik\Plugins\CorePluginsAdmin\MarketplaceApiClient;
@@ -27,6 +25,7 @@ use Piwik\Site;
 use Piwik\UpdateCheck;
 use Piwik\Url;
 use Piwik\View;
+use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 
 /**
  *
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 9d62fb03d7..e55bf8881b 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CorePluginsAdmin;
 
+use Exception;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Filechecks;
@@ -18,9 +19,8 @@ use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\Settings\Manager as SettingsManager;
 use Piwik\Url;
-use Piwik\View;
 use Piwik\Version;
-use Exception;
+use Piwik\View;
 
 /**
  */
diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
index 498729f349..cd38921093 100644
--- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php
+++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
@@ -14,7 +14,6 @@ use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTime;
-use Piwik\Plugin\Manager as PluginManager;
 
 /**
  *
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index f3a1d2f770..434332b81f 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -11,9 +11,9 @@ namespace Piwik\Plugins\CorePluginsAdmin;
 use Piwik\Filechecks;
 use Piwik\Filesystem;
 use Piwik\Piwik;
+use Piwik\Plugin\Dependency as PluginDependency;
 use Piwik\SettingsPiwik;
 use Piwik\Unzip;
-use Piwik\Plugin\Dependency as PluginDependency;
 
 /**
  *
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 3d4b5811a7..81b5de89cc 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -18,6 +18,7 @@ use Piwik\Filesystem;
 use Piwik\Http;
 use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Plugin;
 use Piwik\Plugins\CorePluginsAdmin\Marketplace;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
@@ -27,9 +28,8 @@ use Piwik\Unzip;
 use Piwik\UpdateCheck;
 use Piwik\Updater;
 use Piwik\Version;
-use Piwik\View;
 use Piwik\View\OneClickDone;
-use Piwik\Plugin\Manager as PluginManager;
+use Piwik\View;
 
 /**
  *
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index f3e73cb26d..e338b22ce1 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\CoreUpdater;
 
 use Exception;
+use Piwik\Access;
 use Piwik\Common;
 use Piwik\Filesystem;
 use Piwik\FrontController;
@@ -19,7 +20,6 @@ use Piwik\UpdateCheck;
 use Piwik\Updater;
 use Piwik\UpdaterErrorException;
 use Piwik\Version;
-use Piwik\Access;
 
 /**
  *
diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php
index 5b4253f8f3..b94984045c 100644
--- a/plugins/CoreUpdater/UpdateCommunication.php
+++ b/plugins/CoreUpdater/UpdateCommunication.php
@@ -12,9 +12,9 @@ use Piwik\Config;
 use Piwik\Mail;
 use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 use Piwik\SettingsPiwik;
 use Piwik\UpdateCheck;
-use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 
 /**
  * Class to check and notify users via email if there is a core update available.
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php
index debc716726..af9140fb97 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator.php
@@ -10,7 +10,6 @@
 namespace Piwik\Plugins\CoreVisualizations;
 
 use Exception;
-
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Metrics;
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
index 87f98e7703..9ea703e9ed 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\JqplotDataGenerator;
 
-use Piwik\Common;
 use Piwik\ProxyHttp;
 
 /**
diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php
index 6d90aab1ea..1e63c8f741 100644
--- a/plugins/CoreVisualizations/Visualizations/Graph.php
+++ b/plugins/CoreVisualizations/Visualizations/Graph.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugin\Visualization;
 
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php
index c4f64767a0..5c8ac4d01f 100644
--- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php
+++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php
@@ -8,11 +8,11 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
-use Piwik\Plugin\Visualization;
-use Piwik\View;
+use Piwik\API\Request as ApiRequest;
 use Piwik\Common;
 use Piwik\Period;
-use Piwik\API\Request as ApiRequest;
+use Piwik\Plugin\Visualization;
+use Piwik\View;
 
 /**
  * DataTable visualization that shows DataTable data in an HTML table.
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index d7ae1ac015..1afcdef098 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -13,8 +13,8 @@ use Piwik\Config;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataArray;
 use Piwik\Metrics;
-use Piwik\Tracker;
 use Piwik\Tracker\GoalManager;
+use Piwik\Tracker;
 
 require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
 
diff --git a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
index 0f5419029c..ed4ae6bb21 100644
--- a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
+++ b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
@@ -10,8 +10,8 @@
 namespace Piwik\Plugins\CustomVariables\Commands;
 
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Tracker\Cache;
 use Piwik\Plugins\CustomVariables\Model;
+use Piwik\Tracker\Cache;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php
index c673d51605..01b48bbac7 100644
--- a/plugins/CustomVariables/Controller.php
+++ b/plugins/CustomVariables/Controller.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\CustomVariables;
 
 use Piwik\Piwik;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 870c5f5340..8efed3ce7b 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -12,9 +12,9 @@ use Piwik\ArchiveProcessor;
 use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
+use Piwik\Tracker\Cache;
 use Piwik\Tracker;
 use Piwik\WidgetsList;
-use Piwik\Tracker\Cache;
 
 /**
  */
diff --git a/plugins/CustomVariables/tests/Commands/InfoTest.php b/plugins/CustomVariables/tests/Commands/InfoTest.php
index 586fbc09a8..d8bc90b88e 100644
--- a/plugins/CustomVariables/tests/Commands/InfoTest.php
+++ b/plugins/CustomVariables/tests/Commands/InfoTest.php
@@ -12,10 +12,10 @@ namespace Piwik\Plugins\CustomVariables\tests\Commands;
 use Piwik\Plugins\CustomVariables\Commands\Info;
 use Piwik\Plugins\CustomVariables\Model;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @group CustomVariables
diff --git a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
index 0fbbb9d299..a883f09d1f 100644
--- a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
+++ b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
@@ -12,10 +12,10 @@ namespace Piwik\Plugins\CustomVariables\tests\Commands;
 use Piwik\Plugins\CustomVariables\Commands\SetNumberOfCustomVariables;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @group CustomVariables
diff --git a/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php b/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php
index fd4cc3cc1c..7559857a56 100644
--- a/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php
+++ b/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php
@@ -7,8 +7,6 @@
  */
 
 namespace Piwik\Plugins\CustomVariables\tests;
-use Piwik\Plugins\CustomVariables\CustomVariables;
-use Piwik\Tracker\Cache;
 
 /**
  * @group CustomVariables
diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
index 9b87194450..07f38a77e5 100644
--- a/plugins/DBStats/Controller.php
+++ b/plugins/DBStats/Controller.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\DBStats;
 use Piwik\MetricsFormatter;
 use Piwik\Piwik;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index 3f5a226696..d2a843e690 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -17,7 +17,6 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie;
 use Piwik\ScheduledTask;
-use Piwik\ScheduledTime\Weekly;
 use Piwik\ScheduledTime;
 
 /**
diff --git a/plugins/DBStats/MySQLMetadataDataAccess.php b/plugins/DBStats/MySQLMetadataDataAccess.php
index e5fee259a1..2b0a8ec4e6 100644
--- a/plugins/DBStats/MySQLMetadataDataAccess.php
+++ b/plugins/DBStats/MySQLMetadataDataAccess.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\Plugins\DBStats;
 
-use Piwik\Db;
+use Exception;
 use Piwik\Config;
-use \Exception;
+use Piwik\Db;
 
 /**
  * Data Access Object that serves MySQL stats.
diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php
index b1d7be104f..64b059ea7c 100755
--- a/plugins/DBStats/MySQLMetadataProvider.php
+++ b/plugins/DBStats/MySQLMetadataProvider.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\DBStats;
 
 use Exception;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\DataTable;
 use Piwik\Db;
 use Piwik\DbHelper;
diff --git a/plugins/DBStats/tests/Mocks/MockDataAccess.php b/plugins/DBStats/tests/Mocks/MockDataAccess.php
index b394a2d599..32b6c58e0b 100644
--- a/plugins/DBStats/tests/Mocks/MockDataAccess.php
+++ b/plugins/DBStats/tests/Mocks/MockDataAccess.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\DBStats\Mocks;
 
-use Piwik\Piwik;
 use Piwik\Common;
 
 class MockDataAccess
diff --git a/plugins/Dashboard/DashboardManagerControl.php b/plugins/Dashboard/DashboardManagerControl.php
index af6303d2b0..d445d835be 100644
--- a/plugins/Dashboard/DashboardManagerControl.php
+++ b/plugins/Dashboard/DashboardManagerControl.php
@@ -7,8 +7,6 @@
  */
 namespace Piwik\Plugins\Dashboard;
 
-use Piwik\View\UIControl;
-
 /**
  * Generates the HTML for the dashboard manager control.
  */
diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php
index be2a2beac8..12b5750dcf 100644
--- a/plugins/DevicesDetection/Controller.php
+++ b/plugins/DevicesDetection/Controller.php
@@ -8,13 +8,12 @@
  */
 namespace Piwik\Plugins\DevicesDetection;
 
+use DeviceDetector;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugin\ControllerAdmin;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
-use DeviceDetector;
 
 class Controller extends \Piwik\Plugin\Controller
 {
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 27d9ff4edb..a6b8b45149 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -9,19 +9,17 @@
 
 namespace Piwik\Plugins\DevicesDetection;
 
+use DeviceDetector;
 use Exception;
-
 use Piwik\ArchiveProcessor;
 use Piwik\CacheFile;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\WidgetsList;
-use DeviceDetector;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index d7dbf8d927..895b0ed33c 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -9,8 +9,8 @@
 
 namespace Piwik\Plugins\DevicesDetection;
 
-use Piwik\Piwik;
 use DeviceDetector;
+use Piwik\Piwik;
 
 function getBrandLogo($label)
 {
diff --git a/plugins/Events/API.php b/plugins/Events/API.php
index 0be6037596..bd41c6a0b8 100644
--- a/plugins/Events/API.php
+++ b/plugins/Events/API.php
@@ -9,8 +9,8 @@
 namespace Piwik\Plugins\Events;
 
 use Piwik\Archive;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Piwik;
 
diff --git a/plugins/Events/Controller.php b/plugins/Events/Controller.php
index 87112ccc9a..576d8ae49b 100644
--- a/plugins/Events/Controller.php
+++ b/plugins/Events/Controller.php
@@ -8,10 +8,7 @@
  */
 namespace Piwik\Plugins\Events;
 
-use Piwik\Piwik;
-use Piwik\Plugins\Events\Events;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  * Events controller
diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php
index 638238350c..2c3fa728fc 100644
--- a/plugins/ExampleAPI/API.php
+++ b/plugins/ExampleAPI/API.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\ExampleAPI;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Version;
 
diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index 24aeb1ee64..b0807b391c 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -8,14 +8,6 @@
  */
 namespace Piwik\Plugins\Feedback;
 
-use Exception;
-use Piwik\Common;
-use Piwik\Config;
-use Piwik\IP;
-use Piwik\Mail;
-use Piwik\Nonce;
-use Piwik\Piwik;
-use Piwik\Url;
 use Piwik\Version;
 use Piwik\View;
 
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 47ed50ac43..e6a090a9d0 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -11,14 +11,13 @@ namespace Piwik\Plugins\Goals;
 use Exception;
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
 use Piwik\DataTable;
+use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\Referrers\API as APIReferrers;
-use Piwik\View\ReportsByDimension;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
+use Piwik\View\ReportsByDimension;
 
 /**
  *
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index e86738b1f0..cf0de46ab5 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\Goals;
 
 use Piwik\ArchiveProcessor;
-
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Menu\MenuMain;
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
index 46fc9bde64..10c20260db 100644
--- a/plugins/ImageGraph/StaticGraph.php
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -10,7 +10,6 @@
 namespace Piwik\Plugins\ImageGraph;
 
 use Exception;
-
 use pData;
 use pImage;
 use Piwik\Loader;
diff --git a/plugins/Insights/API.php b/plugins/Insights/API.php
index c36402a6ce..3d22aa5e6a 100644
--- a/plugins/Insights/API.php
+++ b/plugins/Insights/API.php
@@ -8,14 +8,9 @@
  */
 namespace Piwik\Plugins\Insights;
 
+use Piwik\API\Request as ApiRequest;
 use Piwik\DataTable;
-use Piwik\Date;
-use Piwik\Log;
-use Piwik\Period\Range;
 use Piwik\Piwik;
-use Piwik\Plugins\API\ProcessedReport;
-use Piwik\API\Request as ApiRequest;
-use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
 
 /**
  * API for plugin Insights
diff --git a/plugins/Insights/DataTable/Filter/MinGrowth.php b/plugins/Insights/DataTable/Filter/MinGrowth.php
index 21a1b549c5..fb1b86c15b 100644
--- a/plugins/Insights/DataTable/Filter/MinGrowth.php
+++ b/plugins/Insights/DataTable/Filter/MinGrowth.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\Insights\DataTable\Filter;
 
-use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * A row will be deleted if a positive value of $columnToRead is lower than the $minPositiveValue or if the negative
diff --git a/plugins/Insights/Model.php b/plugins/Insights/Model.php
index 4245a48a74..981a7d26f0 100644
--- a/plugins/Insights/Model.php
+++ b/plugins/Insights/Model.php
@@ -8,10 +8,10 @@
  */
 namespace Piwik\Plugins\Insights;
 
+use Piwik\API\Request as ApiRequest;
 use Piwik\DataTable;
 use Piwik\Period\Range;
 use Piwik\Plugins\API\ProcessedReport;
-use Piwik\API\Request as ApiRequest;
 use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
 
 /**
diff --git a/plugins/Insights/Visualizations/Insight.php b/plugins/Insights/Visualizations/Insight.php
index 0ec37c58f1..ca835679ca 100644
--- a/plugins/Insights/Visualizations/Insight.php
+++ b/plugins/Insights/Visualizations/Insight.php
@@ -11,11 +11,9 @@ namespace Piwik\Plugins\Insights\Visualizations;
 
 use Piwik\Common;
 use Piwik\DataTable;
-use Piwik\Period\Range;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugin\Visualization;
 use Piwik\Plugins\Insights\API;
-use Piwik\Plugins\Insights\Model;
 
 /**
  * InsightsVisualization Visualization.
diff --git a/plugins/Insights/tests/ApiTest.php b/plugins/Insights/tests/ApiTest.php
index cba3d57919..06223f1e63 100644
--- a/plugins/Insights/tests/ApiTest.php
+++ b/plugins/Insights/tests/ApiTest.php
@@ -7,10 +7,10 @@
  */
 
 namespace Piwik\Plugins\Insights\tests;
-use Piwik\DataTable\Row;
+use Piwik\API\Request as ApiRequest;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Plugins\Insights\API;
-use Piwik\API\Request as ApiRequest;
 use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays;
 
 /**
diff --git a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
index 76320ca83c..283ead6484 100644
--- a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
+++ b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\Insights\tests\Fixtures;
 
 use Piwik\Date;
+
 /**
  * Adds one website and tracks several visits from one visitor on
  * different days that span about a month apart.
diff --git a/plugins/Insights/tests/InsightReportTest.php b/plugins/Insights/tests/InsightReportTest.php
index 3e50a2ba41..49041f8262 100644
--- a/plugins/Insights/tests/InsightReportTest.php
+++ b/plugins/Insights/tests/InsightReportTest.php
@@ -8,8 +8,8 @@
 
 namespace Piwik\Plugins\Insights\tests;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Plugins\Insights\InsightReport;
 use Piwik\Plugins\Insights\Visualizations\Insight;
 
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 3123ee12bc..a76136e70e 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -14,8 +14,8 @@ use Piwik\AssetManager;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\Db\Adapter;
 use Piwik\Db;
+use Piwik\Db\Adapter;
 use Piwik\DbHelper;
 use Piwik\Filesystem;
 use Piwik\Http;
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index ce4df518f5..8b847106a7 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -13,8 +13,8 @@ use HTML_QuickForm2_DataSource_Array;
 use HTML_QuickForm2_Factory;
 use HTML_QuickForm2_Rule;
 use Piwik\Config;
-use Piwik\Db\Adapter;
 use Piwik\Db;
+use Piwik\Db\Adapter;
 use Piwik\DbHelper;
 use Piwik\Filesystem;
 use Piwik\Piwik;
diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php
index 16d55810ba..aff9603e0a 100644
--- a/plugins/Installation/SystemCheck.php
+++ b/plugins/Installation/SystemCheck.php
@@ -10,15 +10,14 @@ namespace Piwik\Plugins\Installation;
 
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\Db\Adapter;
 use Piwik\Db;
+use Piwik\Db\Adapter;
 use Piwik\DbHelper;
 use Piwik\Filechecks;
 use Piwik\Filesystem;
 use Piwik\Http;
 use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\ProxyHeaders;
 use Piwik\SettingsServer;
 
 class SystemCheck
diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php
index 0aede4ece7..3001f345b5 100644
--- a/plugins/LanguagesManager/Commands/CreatePull.php
+++ b/plugins/LanguagesManager/Commands/CreatePull.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\LanguagesManager\Commands;
 
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Plugins\LanguagesManager\Commands\Update;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php
index 7240c1fba8..8763d51f44 100644
--- a/plugins/LanguagesManager/Controller.php
+++ b/plugins/LanguagesManager/Controller.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\LanguagesManager;
 
 use Piwik\Common;
 use Piwik\DbHelper;
-use Piwik\Piwik;
 use Piwik\Url;
 
 /**
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index cd6fb6916e..fbb9dcf39a 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -12,7 +12,6 @@ namespace Piwik\Plugins\LanguagesManager;
 use Exception;
 use Piwik\Common;
 use Piwik\Config;
-
 use Piwik\Cookie;
 use Piwik\Db;
 use Piwik\DbHelper;
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index bbc23cc08c..de41680fb2 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -11,13 +11,13 @@ namespace Piwik\Plugins\Live;
 use Exception;
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\MetricsFormatter;
-use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 06adb63627..efdde7e9fd 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -16,7 +16,6 @@ use Piwik\Piwik;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Url;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 9e13d9b514..0eca7043c3 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -19,9 +19,9 @@ use Piwik\Plugins\API\API as APIMetadata;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Tracker;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\GoalManager;
-use Piwik\Tracker;
 use Piwik\Tracker\Visit;
 use Piwik\UrlHelper;
 
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 9b7744e2ea..e18ea350d4 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -18,7 +18,6 @@ use Piwik\Nonce;
 use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\API;
 use Piwik\Plugins\UsersManager\UsersManager;
-use Piwik\ProxyHttp;
 use Piwik\QuickForm2;
 use Piwik\Session;
 use Piwik\SettingsPiwik;
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 102529e48a..19ec7a241c 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -12,7 +12,6 @@ use Exception;
 use Piwik\API\Request;
 use Piwik\Archive;
 use Piwik\Common;
-use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\DataTable;
 use Piwik\Period\Range;
 use Piwik\Piwik;
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index c42d00ca60..1802d2f139 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -11,12 +11,8 @@ namespace Piwik\Plugins\MultiSites;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
-use Piwik\MetricsFormatter;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Plugins\MultiSites\API as APIMultiSites;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
-use Piwik\Site;
 use Piwik\View;
 
 /**
diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php
index 29da25a76c..10b05cac5c 100644
--- a/plugins/PrivacyManager/PrivacyManager.php
+++ b/plugins/PrivacyManager/PrivacyManager.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\PrivacyManager;
 
-use Exception;
 use Piwik\Common;
 use Piwik\Config as PiwikConfig;
 use Piwik\DataTable\DataTableInterface;
@@ -17,8 +16,8 @@ use Piwik\Db;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Metrics;
 use Piwik\Option;
-use Piwik\Period\Range;
 use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\ScheduledTask;
diff --git a/plugins/Provider/Controller.php b/plugins/Provider/Controller.php
index 03a702e47f..f46250792f 100644
--- a/plugins/Provider/Controller.php
+++ b/plugins/Provider/Controller.php
@@ -8,8 +8,6 @@
  */
 namespace Piwik\Plugins\Provider;
 
-use Piwik\ViewDataTable\Factory;
-
 /**
  *
  */
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 4e9b2c62cf..9a10b89a27 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -11,8 +11,6 @@ namespace Piwik\Plugins\Provider;
 use Exception;
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
-use Piwik\Config;
-
 use Piwik\Db;
 use Piwik\FrontController;
 use Piwik\IP;
diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php
index feaba305eb..988e0019de 100644
--- a/plugins/Referrers/Controller.php
+++ b/plugins/Referrers/Controller.php
@@ -15,9 +15,7 @@ use Piwik\Metrics;
 use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\SettingsPiwik;
-use Piwik\Url;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php
index df197d49b3..9a567b16d6 100644
--- a/plugins/Referrers/Referrers.php
+++ b/plugins/Referrers/Referrers.php
@@ -13,8 +13,8 @@ use Piwik\Common;
 use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable\AllColumns;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable\AllColumns;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie;
 use Piwik\SettingsPiwik;
 use Piwik\WidgetsList;
diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php
index 588254bfb4..22976b3cd7 100644
--- a/plugins/SEO/RankChecker.php
+++ b/plugins/SEO/RankChecker.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\SEO;
 
 use Exception;
-
 use Piwik\Http;
 use Piwik\Log;
 use Piwik\MetricsFormatter;
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index e5926e1b44..26d5159dd3 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -17,8 +17,8 @@ use Piwik\Piwik;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\Plugins\SitesManager\API as SitesManagerApi;
-use Piwik\ReportRenderer;
 use Piwik\ReportRenderer\Html;
+use Piwik\ReportRenderer;
 use Piwik\Site;
 use Piwik\Translate;
 use Zend_Mime;
diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
index e4854d465f..580056aca7 100644
--- a/plugins/ScheduledReports/ScheduledReports.php
+++ b/plugins/ScheduledReports/ScheduledReports.php
@@ -10,13 +10,11 @@ namespace Piwik\Plugins\ScheduledReports;
 
 use Exception;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Mail;
 use Piwik\Menu\MenuTop;
 use Piwik\Piwik;
-use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
diff --git a/plugins/SegmentEditor/Model.php b/plugins/SegmentEditor/Model.php
index a58f25385c..68b3fcff53 100644
--- a/plugins/SegmentEditor/Model.php
+++ b/plugins/SegmentEditor/Model.php
@@ -8,12 +8,8 @@
  */
 namespace Piwik\Plugins\SegmentEditor;
 
-use Exception;
 use Piwik\Common;
-use Piwik\Date;
 use Piwik\Db;
-use Piwik\Piwik;
-use Piwik\Segment;
 
 /**
  * The SegmentEditor Model lets you persist and read custom Segments from the backend without handling any logic.
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index c7dd76620c..cc08f2a952 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -8,11 +8,8 @@
  */
 namespace Piwik\Plugins\SegmentEditor;
 
-use Exception;
-use Piwik\Common;
 use Piwik\Db;
 use Piwik\DbHelper;
-use Piwik\Piwik;
 use Piwik\Version;
 
 /**
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 3baf42679e..366a5a1233 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -17,6 +17,7 @@ use Piwik\IP;
 use Piwik\MetricsFormatter;
 use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\ProxyHttp;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Site;
@@ -24,7 +25,6 @@ use Piwik\TaskScheduler;
 use Piwik\Tracker\Cache;
 use Piwik\Url;
 use Piwik\UrlHelper;
-use Piwik\ProxyHttp;
 
 /**
  * The SitesManager API gives you full control on Websites in Piwik (create, update and delete), and many methods to retrieve websites based on various attributes.
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index b315e3cd84..60e13b96f7 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -11,15 +11,12 @@ namespace Piwik\Plugins\SitesManager;
 use Exception;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
-use Piwik\DataTable\Renderer\Json;
 use Piwik\Date;
 use Piwik\IP;
 use Piwik\Piwik;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Site;
-use Piwik\Url;
-use Piwik\UrlHelper;
 use Piwik\View;
 
 /**
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 21cd3ff2a3..5664e1b766 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -14,9 +14,9 @@ use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataArray;
+use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Period;
 use Piwik\Piwik;
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index d60111d97d..31967e5c60 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\UserCountry;
 use Exception;
 use Piwik\Archive;
 use Piwik\DataTable;
-
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider;
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 7b9a634b76..302866b41f 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -14,13 +14,12 @@ use Piwik\DataTable\Renderer\Json;
 use Piwik\Http;
 use Piwik\IP;
 use Piwik\Piwik;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Pecl;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php
index 5699e7b80c..a26807fb20 100755
--- a/plugins/UserCountry/GeoIPAutoUpdater.php
+++ b/plugins/UserCountry/GeoIPAutoUpdater.php
@@ -17,9 +17,9 @@ use Piwik\Http;
 use Piwik\Log;
 use Piwik\Option;
 use Piwik\Piwik;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Php;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTaskTimetable;
 use Piwik\ScheduledTime\Monthly;
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
index 075dfa778d..234690e35e 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
@@ -12,8 +12,8 @@ namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Common;
 use Piwik\IP;
 use Piwik\Piwik;
-use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 
 /**
  * A LocationProvider that uses an GeoIP module installed in an HTTP Server.
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 0f33f5cfe8..ddeb61521f 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -17,10 +17,10 @@ use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
 use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
+use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
 use Piwik\Url;
 use Piwik\WidgetsList;
 
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index 8e44340f86..0c52344c0f 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\UserSettings;
 
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index ad59009ec9..efc77ac9b9 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -11,16 +11,16 @@ namespace Piwik\Plugins\UsersManager;
 use Exception;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
+use Piwik\MetricsFormatter;
 use Piwik\Piwik;
+use Piwik\Plugins\LanguagesManager\API as APILanguagesManager;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Plugins\LanguagesManager\API as APILanguagesManager;
 use Piwik\Site;
 use Piwik\Tracker\IgnoreCookie;
 use Piwik\Url;
 use Piwik\View;
-use Piwik\MetricsFormatter;
 
 /**
  *
diff --git a/plugins/UsersManager/LastSeenTimeLogger.php b/plugins/UsersManager/LastSeenTimeLogger.php
index 46d60ad1ca..82928b39ea 100644
--- a/plugins/UsersManager/LastSeenTimeLogger.php
+++ b/plugins/UsersManager/LastSeenTimeLogger.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\Plugins\UsersManager;
 
-use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Option;
+use Piwik\Piwik;
 
 /**
  * Class that logs the time the current user is accessing the current resource (which
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index e837fee01d..2997202226 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -9,13 +9,11 @@
 namespace Piwik\Plugins\VisitFrequency;
 
 use Piwik\API\Request;
+use Piwik\Archive;
 use Piwik\DataTable;
 use Piwik\Piwik;
-use Piwik\Common;
-use Piwik\Archive;
-use Piwik\SegmentExpression;
-use Piwik\SettingsPiwik;
 use Piwik\Plugins\VisitsSummary\API as APIVisitsSummary;
+use Piwik\SegmentExpression;
 
 /**
  * VisitFrequency API lets you access a list of metrics related to Returning Visitors.
diff --git a/plugins/VisitTime/Controller.php b/plugins/VisitTime/Controller.php
index 59a254c4c2..0bd7b00f53 100644
--- a/plugins/VisitTime/Controller.php
+++ b/plugins/VisitTime/Controller.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\VisitTime;
 
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 93e8d9ca35..a3201fc3f9 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\VisitTime;
 
 use Exception;
-
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\Menu\MenuMain;
diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php
index 239abd2ffc..1880532286 100644
--- a/plugins/VisitorInterest/Controller.php
+++ b/plugins/VisitorInterest/Controller.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\VisitorInterest;
 
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 638f5feee2..fbdda4dc1f 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -10,8 +10,8 @@ namespace Piwik\Plugins\VisitsSummary;
 
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugins\Actions\API as APIActions;
 use Piwik\Site;
-- 
GitLab