diff --git a/core/API/DataTableGenericFilter.php b/core/API/DataTableGenericFilter.php
index 6b24e00c6aff3ae1a17115616d9808210eb8ade0..d540b750f3605abdae60778a21d8c789d7d929d8 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 5ebdd2fbcf63654615c585f1fb85d0ebdebdfbd2..0c19cc844a3a97b13346f55c87dd9a125a330c0e 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 20fe2c028fbee6be7b3f19e978a7645685b0bbdf..9d1d53d0893ae23901ba1326f25de88c0c9e2628 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 05c594b35a57b393cb22e974f9a504da123bfbcd..c2075b1efecaaefcdac44ff4104cefc5421a7e39 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 ee289d8ba8a7c9d8986fd8c0c989e1d67afdc5e2..a0b336ffd8e439dc2f13e176b84ec47026f02b9f 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 692a2ceb71034fe5863725787dbeab29402c047d..255944bdbe3b4dd442db8a0a2f426671db7ac3c8 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 71a5dd5f332110fd0e90332e4deea0021cc01fe9..a858765c1f5f06964b350831fb21481361ada717 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 a271f4090567476cfd672375c10d1c131f5a88f5..431b5e818fd42a8d517d663ad5a79a891110247d 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 1f700819eeee749fa8bec8a7d51bb2f53002e753..a8d769b098df716fd8d8601afd47d10b58553e5f 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 b3383e5ce2ff4ab98af0dcafbd3df7fff24d64b6..1a5fec8a7d065947e9bee97e8e57bc0990f23a11 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 82f361f702040bccf773a6ecd31cc4b606d1efb3..8d3703c52286dc585a3bc7f41802d5cfd3fc4568 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 6bcd5fbd876557480af077d9549cd36fc560ed7c..45250b0d2319a62bf69931cef25205452e0eafe6 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 972c84c37fe0b6bd5e2988f3403fb7ed51a35fc2..8df4be83ddaf3e2555a1eafe928fb7a8d8f1ea35 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 fd98da90725e6e7a42b4a4e296409d87c9a460b4..8ac12365fc6efeb0792fc31f7740b39206e0d600 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 93b7d7bf6d85ea762c17821aede618cd9bcd5d91..3cd57f11d0ac0738a861e03aa90f4b67ab348378 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 52c21c9447d83b9a4e0f9636f5232d9637d37fe8..a5ebe11921eafd453b115242f85b4124570bea3a 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 34006f5a32f04a11a5126f56fb619507e5fa781e..4388ecaaa9e7fad2e92493faee581c594a524e5a 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 f6ccfd34549f3ecac506fdaa5f392c6c2c29b2ca..253102db88a55ea27ce8c09bb066ab6320ba9239 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 876f6ff8e86101227eccbfa32cb01376b43a9458..907877b4002ef37413d1938fd4654990bac21413 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 cdeb6a087d04603175dbd630548c1b6e51327a0a..6f32eb8f333ea3af993c34aaa8b022870ed31440 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 4ba9b21b0120b5171660b07b3723d2cbbdf4b7b5..c24c0fb52a27638814c9238cd28fa004ca9f935e 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 8c54dd52b0814bcde6cf378b7608793f5f1bd6d8..1563a639c96bbeda07ef249322db1c37210f123b 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 f3a3a740cb4abc516466555f2853f2fef2490781..9c330715c0620aa3632d4842b9aca07a70aa3422 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 6d75b5f71b35ffb5bc4bd15e63973c6e1af5d69e..0fa7e67ef1e19daa70b7b0ce0145e3611cda7957 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 cf924e03e9574ef230363f967fd6440ce1ef2945..c2b2467d724a1957daf2c8b8fecf0b64a91a6082 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 cd6629f8b0055961f4bb1c00ebce7c13d3c64402..e60d3fa6af7b220b3e2e44d4cef0730b441b8701 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 fd842ad0ff114f8ca1c3f9aaae4f843b85cc3800..2417aa9dd642c8828ca05b49b91c5f538bd2b607 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 b89a306a1a599956db1f11e605d3c6f4f4ceab1c..f3c9e979929f4099bdf15b5623a42e00a86e1ac0 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 fbef2d91b9fa0e75f9c29a30e8ec4acbac100bc7..7050a3eb7b6098a50c4d107af071ace40175fd82 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 fa5389650b4adfa2857a4198f899581b409b09ed..651a3f7564560c40e23210b555f3863be1699f98 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 7985afb1d88e6ad58adf3e03823edc6ec318d449..51355af56c91ec42d054801c9f30508ac80f16fd 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 75d6d68fc084f4ecdf5a754d122b3019ff4d06df..58ef0f156aef174198be7530e1366ee27783b468 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 ca4cd653ee5998a80e964fe9c44a2b5f8123faa1..931831b3339c1b29b836712a6f0a7c26a992dd7b 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 80e49bc22d24af4476c147b552d0c868709dac1d..cbc71a038c6826db5482474f3563ec995a7f2296 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 2c07e00bb811c6a1e1bb7e051b9488bc7f4fe856..c23594c3ebbceeaa5c2bce50a26bd9e4c3b8b2cf 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 883745807302f1003c3c831c0b848b659d562798..f7934c7e312ab809a84b28c4e5140eba4729265f 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 76928a21b3da3b1a2bbfb92d12a36006534cc301..659954d06a67e3f67255c31913b4275672ce8a71 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 9fc808e13dfdc0889e3b76d5ec431c3cac928d8a..66d7aa7c65b71520be000c3161d3ebc9a9da0092 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 95abfe784cc6763817fbb4086719032c6e7328b1..be3193b344d175f8b361552567f891082be051c8 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 ede6952f731604aad3db6dd0be7f1809a6fe0ca1..1d9a62696a1793584b208cb152b421d84f12c9e4 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 3e6d4a8e119ead7937eb19f49f2ba37682de8fe5..bf140e0b563878eed50e8ec4c832b6d43de31c90 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 56051341ab28082c85dfe01a422d167cfc49c607..4574865238f38cd5e67211182fc4362ff7553fca 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 0448f8a721c4f73b9548992ae696b86ccf309162..4e5a574966bbba5f88e5bfe7e54bb6b1b59deae3 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 5816bd33218e510736d0cde273951c1005fc1886..047464551c305eba5d1ec294c25374d500ccccff 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 c49aef59ba8f6d9a597bc77a2bc3dc74e7d56f0b..f6d4365ea6364cabb58681435f396b9d4077062c 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 4634f9197c891c38e3d1c54f256e3a55cdda6e9c..8105b98d75264589618aaab52166b38ec8b1012b 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 779150153969049df5a03c365563bcfb80da6712..6262a1cd6d82b9d8cb23948b2c676178c69529ca 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 cac2ec14f776ffa9e6e499bc2e06f950658db333..603380dc9b05fe27a8aba3ee3ab5819a75e32b62 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 eae69145e7d7d25fd99de5f03aca57d80ec8d845..35cdb0edac230750d161d77cb1bc1210636bc342 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 edf8185d9857b8f88f4e8ffe17384eff1887d03a..1572c7099c784935f5f9b616988b6128764bca73 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 3a2e04abfde6a05cde1e9c435427fb38d535a518..eb1fde8400b04396d0d31d4395bcacaec16c933c 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 1cd7d7c9fb59b16af0aa8bd45aab2038dae4ce54..01fde5665ff88b92d2d745d75fa4f80be3e68786 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 a9b7988b77b4e3201e9436ce6e4f8986915f7dbc..6b628c9be782d469186e5f980be580cfb271f929 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 2e9b593a2a3e85bc265ae73a152e99856564fcda..868f9d4e04733b644cb0f9adb1ce9b19113def17 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 78c8ab2b542b550d3088d4d604a50eb13a71008c..a146275a4940f4e12181011471c3e1517381dab8 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 83b199033ed57dffaf31ebc9f2bd9b669188ce37..50030c2e84b50ca43c8cf151a4fd768af8ba36fb 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 354ae17ffa17a4cd333313f2027b97a8090d1fe8..5dbfd95d069bc05785a4d815c920feff56b6e156 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 4eb924d3d6a69cf40d8bbbbebcfd81924d579ed5..3d545466944ef69e047e1c9ea4d8e1df8bc892dc 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 8437a83dbbcddd53b27e371530e8aebb2463e084..82ef7395d8520cc7a7bff1e37a0c96dde77d304a 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 69f50d4e0bc89a628efbf69830b69695aee832a0..8b784822019f4d950577ba9ef35fcd2ef2b84d51 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 ddb21b93714929d153d8eba9264f525673753d39..6acd3a8fe0dbdde2c4098509bcd9232e754c8b05 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 467c5615f32914b3f2a6808991d41e163aca3297..d0032ade0768659746694f4d11027b06ac76f243 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 c8a3769e67fdadeb2fb80dfd2047ea790f20fc4e..7b5838db580dc89771775e25ce5ae4d45fb2a06a 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 bb2d4af6302707aa59af35737fb586f961ab9851..6d2b0e4e461565d28b7aa471a2a79c44a57edc43 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 3236500b4b490a0c8d9c587cff9dd7dfd2c5eac8..8ed8931e003f663292f1634a20819bfeaced6366 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 b4ebe24da526d0adcf4ccd1b013e242411d86811..4f203ebf582cbbb00662b309a18ebc5520beabd9 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 2ed50efadf405d3664378a1960bb1c3ddf91a149..52d5d0c6a08d44d984d0c64df8dfe8d60d7bcad1 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 af56986a6af04ab1ce88ada9e515163953564380..054eff828737c1ceae9f1ac5b929fe159cd5b67e 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 605064bbec28dc9140b5853ee85321bdc8c0a0ff..418d9be0ec4ae233824367d9bb689a0d98499ee8 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 0c106cbc04a6f694d4412e936cba83e51031ddf7..94aa0491ca4ded142d1279f30a338f47fba50ce7 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 aadb87bd23fb9654a9a51669bf4d4acac35e69b3..d59557e1b83860fa6648fd9a24699621de728a98 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 d5dee39a61ff4972f44138795755288f6724dde5..e52dc3324d09c67cfaca976e8e82f63d711788ba 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 cf111284581322b9dc686338d0f8d8d408ab0153..1a08945e5e59d6123ae983d1ba25d41d835042bc 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 f7e20cbfc3698aebc7fb7b997d2fef04c7573e57..d1116425bca35e91a14b792df9709761f6a9506e 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 6db3feec8a32b21eedf9dce2139328e8d0f844f8..d2610483bb6c68807c5ed3fdfc740c3c6fb8918a 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 9d62fb03d755c032b05ecff2f2ce7e81a0926751..e55bf8881b5b158dfb7a512b4c909d1ed7af3e4b 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 498729f349e173a60cf344247ad3f00185268db4..cd38921093bcbb1f9a3d40e7503a5d764e2857f4 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 f3a1d2f7709c4147d85c253ed06b71c63fd44c01..434332b81fcc2d27e85d7c5f48fed52b105cde62 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 3d4b5811a74256b3b8913ef6f719611c28de62c8..81b5de89cc08d6cbde0d76b93342e6b82bebcecc 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 f3e73cb26d8505093873e79b1deaa4a9023fa42f..e338b22ce10b9f3da3511d7b84e24afb39bb1d11 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 5b4253f8f3549a79d151e029d702b5e1e3f9ca85..b94984045c495635df35c3b4dfbb47bd795383c6 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 debc71672654eabf166b5a26006157258c7963ab..af9140fb97f088f3c63207519ea82b80be50bc1b 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 87f98e7703b0f1411f552123b0cd4f8ba54050e8..9ea703e9ed1e896bab2e0d46d04342ec30ee0bd9 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 6d90aab1eaecf32fc55a0ad0490013e0474d57b4..1e63c8f74137446f6c98dc2995374ed0d9d18c87 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 c4f64767a03a8456e9db3d3cbbf94825b80f80aa..5c8ac4d01f2e02ad32ca06761b70a1f7d885d09f 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 d7ae1ac0151872d79ef4d23f82f1d0d818f06019..1afcdef09803fb264ef3f43aea550a6dd010a45e 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 0f5419029c7539bd83e9476b73273c3da2a1276e..ed4ae6bb21e40f65a3779c1208d77bcdacd03e40 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 c673d51605f88ee71517716c51cea09b7996ad04..01b48bbac77ebb33a0d46ddd0c51a3356e6b1fb4 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 870c5f5340503c724f57e6748fd077a7fd5ac2b0..8efed3ce7b0556f45ec87e9649f81f144b96473f 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 586fbc09a8a49e207a1a479bf990a3e53595db85..d8bc90b88eb22781d839462ad8858abe12fc9ecd 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 0fbbb9d2995241b4ebc24f0fade8ca26890102d5..a883f09d1f246a6b9a2fd61ba5e595f9b2b5cca9 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 fd4cc3cc1cd9765e0e59f71b54e941a7bfffe465..7559857a56ec4094e3cc35a741aed3eb5d534d0d 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 9b871944505725e8d5613a199def4679f6201ae6..07f38a77e58554bb98e895a86c3e2dae24122971 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 3f5a2266964afb4bc6d4dd4aa35da7c6b5fafc57..d2a843e690834bc90262f3b1714bd1ac8fb0daf4 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 e5fee259a188573d18b4540d7cd9a431468fe71c..2b0a8ec4e67df57381be49b391143dea5cd186dd 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 b1d7be104f90b105f893b33bd41d94723df001f3..64b059ea7c1cfdd2aedefdec8c1a5cb26292f4d7 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 b394a2d59995c2be7ebe40f4992646cd4cbf35bc..32b6c58e0b95cc394091bdf202f9a38e2bb8c0b6 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 af6303d2b0ca8ba1d07e17a58e4127717da36793..d445d835be90179a381c85e4d110c9c97c6106a6 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 be2a2beac8868e96432c470ed7ea83953d7000c5..12b5750dcf732b772d7e905bf89db328ddd6b0ba 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 27d9ff4edb7d0607f7f6593b554788087a218d6e..a6b8b451496c16bfb1d2d3971f1568f8fe7fe15a 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 d7dbf8d9276402ee0ac71dd2158ba435308dfb86..895b0ed33cae0ce6e3a700c8f02d4b245a3cb1b2 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 0be6037596cb2685e7785dee72a37fe32e446ce7..bd41c6a0b876ec0a2b024f0b03712f303aa64cd7 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 87112ccc9ac50de3e4e1392072ab89a9b7cc4f37..576d8ae49bc441a4d5c038a152a2ab249d94bc96 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 638238350c0260658508a33122778ebb8f6168b9..2c3fa728fcd56295134e373859386bb61d645b76 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 24aeb1ee64bc91fef779fd80c0bb8a47446551aa..b0807b391c26a5b909672c0ec85720040b5d6888 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 47ed50ac433ed7f5aabeff3cbc99549f041ccf9a..e6a090a9d053c3cdbd78913db7592359dcec5f35 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 e86738b1f09aae652b69455c9230f884446c421a..cf0de46ab5b52c242127a0cf38b8bdee89fd8b8f 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 46fc9bde649e4faee6a45f1255cbd82da439e755..10c20260db156b52a066fa5e59c118ce0f6b1a95 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 c36402a6ce96d0bc4fc4a01e2d4cdb541170f888..3d22aa5e6a8ed8604874812af15dd9fbf9bbf0ce 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 21a1b549c51f831c1540f10fed19aabc40d2d021..fb1b86c15b3ffab48146af65d250a957ae27ffd3 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 4245a48a74ba3192d7460f4c52c113c04744f637..981a7d26f0741b8926318dff169b9eda6acbf682 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 0ec37c58f1d73e9c7912abd95dd7a7e3e02b4703..ca835679cada14669405669d32212eecf1f19dac 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 cba3d57919af3fcda02c61510355fabc3b0ef3a2..06223f1e6306b5fbe88d10571b1d79fc8e00d04e 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 76320ca83cabeafed578a22767720a2494a4d67a..283ead64843a4660768bd8b71a3c1eb853a18cfc 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 3e50a2ba416c7ef55f59f97c99d855971b89b550..49041f8262318349322eb735d8f39cb11c030743 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 3123ee12bcb5e8a1fec0395f736227b11f308fb9..a76136e70eaf49be087fa13c674bec80ef7b0f9f 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 ce4df518f5d3612af056829fd4068a675e461708..8b847106a7ac7da34b6385d1daedcd3f233621de 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 16d55810bac8e05cd0efbdd3dc68fd3ba1857095..aff9603e0abb6dead49ad372dfff0e95f91a39c7 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 0aede4ece754d2f8f595357e78930306409f5dca..3001f345b5a6c85e9d2c7dd6804a698b667f0051 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 7240c1fba8cca6cf2663408c20aa2af10a791796..8763d51f44a4f214f853d863388eed32be97df48 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 cd6fb6916e745a8cde052d98544a4853dcbb8290..fbb9dcf39a653d61a8f20d6e3ee4150512ec230a 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 bbc23cc08c0251fb3dbb8a484a9e706d4892d6eb..de41680fb2ba765898851a6baa7d3779033e2fe0 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 06adb63627c7370ae1130c5d0ddfd319226aaf13..efdde7e9fdf54bbafe392d1cd974150024220c6d 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 9e13d9b514dfe22e237f799412caf2a550fb56e8..0eca7043c3e966720cff477746f55c49eb2b45ac 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 9b7744e2ea9f47dd8fb313c5b9ed48b0faf08a05..e18ea350d4c62f9e3145b1f5b90025ed48f8ab03 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 102529e48ab9ab0cc05a94ffb29a11fc283c3b49..19ec7a241c24fe405ad480ba8938eb364431a25f 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 c42d00ca60ade9ff6db797483a8480db185b52d7..1802d2f1397cb7134b97fad97563742550608bad 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 29da25a76cec29c1b1151669fa0218893fe031c9..10b05cac5cea880bb20dc063655b7d99cdabe28a 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 03a702e47f3e6ec85902bafa6a644d4e2a05e6e8..f46250792f69015c878d5f53744bd7a1bf1ab21d 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 4e9b2c62cfb21a5c1fb2c90ace97fdae4075f541..9a10b89a272085c0baf8f81e12547b4df6d92f11 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 feaba305eb6ea72ef84c1828238dc9a83f4ff511..988e0019de27d2f2aa63efc3087b0aa8d3246042 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 df197d49b3f06ba1fb556ebff0bd7c7b42a8c535..9a567b16d65faa2d6f269c0cab60d1fa1d36a69f 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 588254bfb4d0f7afa0bd4f28bfca2ab4fd5d146e..22976b3cd73a4a1f3949423c75d597b1a9e624d6 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 e5926e1b44dc91a4503eeb6ad560570d00ddfd42..26d5159dd3116abae30a55ccc1d112cd2d08358c 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 e4854d465f66424cdd190ec84d324234d34608b9..580056aca78879a2e615eaef70535f635b2361ca 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 a58f25385c6ebcb8ff5354489d623ad2b8d7c742..68b3fcff53dfea18a982947be089a26ec655a187 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 c7dd76620ce2123ed08ccf67e4a70659b01330d4..cc08f2a9520623bef71b682ef148facb356f19d4 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 3baf42679eb9d25abcdeefccb92c5782858dc4d8..366a5a123309c391bb02a3a5e68c1bc460557345 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 b315e3cd84d532bbd13ea34dc0f2e12d411aa509..60e13b96f7574c468653a00a0d24485a1c1821df 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 21cd3ff2a32eea15a7ed02073a366fb3e4372641..5664e1b7660a929b07cb5260c09060f3b756849f 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 d60111d97dd71260a9c88f315fe270bae9e03396..31967e5c603aaa5787ec645908bee77a122ec2f7 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 7b9a634b7636027c68cbeb6169fddc9053f4ce7d..302866b41fca47d96e58e4da4b59423d4a1c2cb0 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 5699e7b80cdb459a80f8a5e4def642eb368d8465..a26807fb209d244262523b5160165d676d932de7 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 075dfa778dfe796d2dacc30d509613bb06d9dcde..234690e35e3332abed2fd214269dbcf68d4ef326 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 0f33f5cfe8f5e5b2f79dba976c3306c728096d52..ddeb61521fe6154bf99650f2bb118479791ba538 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 8e44340f862d015e9e1b60214e36a70e8a28633e..0c52344c0f45544d1f070dece97f9b0a424ef171 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 ad59009ec9a2f268e0463f6199f72d9340f4c8a4..efc77ac9b9e82eacaadc1e8d16511db4bae46756 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 46d60ad1caeda5f54a0cf3443dee5a095f115a44..82928b39ead767b9cacae92b8ed3c8f0e530ec0d 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 e837fee01d274458a648eb9e21928b224be4b1ff..2997202226580819333cc94c494bf42319fdeb87 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 59a254c4c2b71beff53f9ed951d0937a7708f228..0bd7b00f53704c82a0d699032b6734f6ea0eaa16 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 93e8d9ca355d466ac24ff4481403b89f9b8aed29..a3201fc3f9bbbda9bd4590d8b7f11c6f1573353e 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 239abd2ffcc23db7e37f83b3f4664e2eaa5d9783..18805322869ddc0f547f909b04637665ce31b96f 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 638f5feee2e77ea447d1e0ea964a94897abacbcb..fbdda4dc1f37d2cba2c666559b40d26a050ce9bd 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;