Removed unused imports in core/ and plugins/

using phpstorm optimize imports feature

63 files changed, 68 insertions, 115 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();