Removed unused imports in core/ and plugins/

using phpstorm optimize imports feature

90 files changed, 71 insertions, 154 deletions

diff --git a/plugins/API/API.php b/plugins/API/API.php
index bb2d4af630..6d2b0e4e46 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -11,14 +11,14 @@ namespace Piwik\Plugins\API;
 use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Config;
+use Piwik\DataTable;
 use Piwik\DataTable\Filter\ColumnDelete;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Menu\MenuTop;
 use Piwik\Metrics;
-use Piwik\Period\Range;
 use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Tracker\GoalManager;
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 3236500b4b..8ed8931e00 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -12,9 +12,9 @@ use Exception;
 use Piwik\API\Request;
 use Piwik\Archive\DataTableFactory;
 use Piwik\Common;
+use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\DataTable\Simple;
-use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Metrics;
 use Piwik\MetricsFormatter;
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index b4ebe24da5..4f203ebf58 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -13,14 +13,14 @@ use Piwik\API\DataTableManipulator\LabelFilter;
 use Piwik\API\Request;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
+use Piwik\DataTable;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\DataTable\Filter\SafeDecodeLabel;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Url;
 use Piwik\Site;
+use Piwik\Url;
 
 /**
  * This class generates a Row evolution dataset, from input request
diff --git a/plugins/Actions/ArchivingHelper.php b/plugins/Actions/ArchivingHelper.php
index 2ed50efadf..52d5d0c6a0 100644
--- a/plugins/Actions/ArchivingHelper.php
+++ b/plugins/Actions/ArchivingHelper.php
@@ -10,10 +10,10 @@ namespace Piwik\Plugins\Actions;
 
 use PDOStatement;
 use Piwik\Config;
+use Piwik\DataTable\Row\DataTableSummaryRow;
+use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
-use Piwik\DataTable\Row\DataTableSummaryRow;
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Tracker\Action;
diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php
index af56986a6a..054eff8287 100644
--- a/plugins/Actions/Controller.php
+++ b/plugins/Actions/Controller.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\Actions;
 
 use Piwik\Piwik;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  * Actions controller
diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php
index 605064bbec..418d9be0ec 100755
--- a/plugins/Annotations/API.php
+++ b/plugins/Annotations/API.php
@@ -9,10 +9,9 @@
 namespace Piwik\Plugins\Annotations;
 
 use Exception;
-
 use Piwik\Date;
-use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as EvolutionViz;
 
diff --git a/plugins/CoreAdminHome/API.php b/plugins/CoreAdminHome/API.php
index 0c106cbc04..94aa0491ca 100644
--- a/plugins/CoreAdminHome/API.php
+++ b/plugins/CoreAdminHome/API.php
@@ -9,17 +9,14 @@
 namespace Piwik\Plugins\CoreAdminHome;
 
 use Exception;
-use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Option;
-use Piwik\Period;
 use Piwik\Period\Week;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\PrivacyManager\PrivacyManager;
-use Piwik\Plugins\SitesManager\SitesManager;
-use Piwik\SettingsPiwik;
 use Piwik\Site;
 use Piwik\TaskScheduler;
 
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index aadb87bd23..d59557e1b8 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -16,7 +16,6 @@ use Piwik\Config;
 use Piwik\DataTable\Renderer\Json;
 use Piwik\Menu\MenuTop;
 use Piwik\Nonce;
-use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugins\CorePluginsAdmin\UpdateCommunication;
 use Piwik\Plugins\CustomVariables\CustomVariables;
diff --git a/plugins/CoreConsole/Commands/GenerateCommand.php b/plugins/CoreConsole/Commands/GenerateCommand.php
index d5dee39a61..e52dc3324d 100644
--- a/plugins/CoreConsole/Commands/GenerateCommand.php
+++ b/plugins/CoreConsole/Commands/GenerateCommand.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Plugins\CoreConsole\Commands;
 
-use Piwik\Common;
 use Symfony\Component\Console\Formatter\OutputFormatterStyle;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/CoreConsole/Commands/ManagePlugin.php b/plugins/CoreConsole/Commands/ManagePlugin.php
index cf11128458..1a08945e5e 100644
--- a/plugins/CoreConsole/Commands/ManagePlugin.php
+++ b/plugins/CoreConsole/Commands/ManagePlugin.php
@@ -8,8 +8,8 @@
 
 namespace Piwik\Plugins\CoreConsole\Commands;
 
-use Piwik\Plugin\Manager;
 use Piwik\Plugin\ConsoleCommand;
+use Piwik\Plugin\Manager;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/CoreConsole/Commands/SetupFixture.php b/plugins/CoreConsole/Commands/SetupFixture.php
index f7e20cbfc3..d1116425bc 100644
--- a/plugins/CoreConsole/Commands/SetupFixture.php
+++ b/plugins/CoreConsole/Commands/SetupFixture.php
@@ -8,13 +8,12 @@
 
 namespace Piwik\Plugins\CoreConsole\Commands;
 
-use Piwik\Url;
-use Piwik\Piwik;
 use Piwik\Config;
 use Piwik\Plugin\ConsoleCommand;
+use Piwik\Url;
 use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 /**
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index 6db3feec8a..d2610483bb 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -15,9 +15,7 @@ use Piwik\Date;
 use Piwik\FrontController;
 use Piwik\Menu\MenuMain;
 use Piwik\Notification\Manager as NotificationManager;
-use Piwik\Option;
 use Piwik\Piwik;
-use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 use Piwik\Plugins\CoreHome\DataTableRowAction\MultiRowEvolution;
 use Piwik\Plugins\CoreHome\DataTableRowAction\RowEvolution;
 use Piwik\Plugins\CorePluginsAdmin\MarketplaceApiClient;
@@ -27,6 +25,7 @@ use Piwik\Site;
 use Piwik\UpdateCheck;
 use Piwik\Url;
 use Piwik\View;
+use Piwik\ViewDataTable\Manager as ViewDataTableManager;
 
 /**
  *
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 9d62fb03d7..e55bf8881b 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\CorePluginsAdmin;
 
+use Exception;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Filechecks;
@@ -18,9 +19,8 @@ use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\Settings\Manager as SettingsManager;
 use Piwik\Url;
-use Piwik\View;
 use Piwik\Version;
-use Exception;
+use Piwik\View;
 
 /**
  */
diff --git a/plugins/CorePluginsAdmin/CorePluginsAdmin.php b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
index 498729f349..cd38921093 100644
--- a/plugins/CorePluginsAdmin/CorePluginsAdmin.php
+++ b/plugins/CorePluginsAdmin/CorePluginsAdmin.php
@@ -14,7 +14,6 @@ use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTime;
-use Piwik\Plugin\Manager as PluginManager;
 
 /**
  *
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index f3a1d2f770..434332b81f 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -11,9 +11,9 @@ namespace Piwik\Plugins\CorePluginsAdmin;
 use Piwik\Filechecks;
 use Piwik\Filesystem;
 use Piwik\Piwik;
+use Piwik\Plugin\Dependency as PluginDependency;
 use Piwik\SettingsPiwik;
 use Piwik\Unzip;
-use Piwik\Plugin\Dependency as PluginDependency;
 
 /**
  *
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php
index 3d4b5811a7..81b5de89cc 100644
--- a/plugins/CoreUpdater/Controller.php
+++ b/plugins/CoreUpdater/Controller.php
@@ -18,6 +18,7 @@ use Piwik\Filesystem;
 use Piwik\Http;
 use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\Plugin\Manager as PluginManager;
 use Piwik\Plugin;
 use Piwik\Plugins\CorePluginsAdmin\Marketplace;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
@@ -27,9 +28,8 @@ use Piwik\Unzip;
 use Piwik\UpdateCheck;
 use Piwik\Updater;
 use Piwik\Version;
-use Piwik\View;
 use Piwik\View\OneClickDone;
-use Piwik\Plugin\Manager as PluginManager;
+use Piwik\View;
 
 /**
  *
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index f3e73cb26d..e338b22ce1 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\CoreUpdater;
 
 use Exception;
+use Piwik\Access;
 use Piwik\Common;
 use Piwik\Filesystem;
 use Piwik\FrontController;
@@ -19,7 +20,6 @@ use Piwik\UpdateCheck;
 use Piwik\Updater;
 use Piwik\UpdaterErrorException;
 use Piwik\Version;
-use Piwik\Access;
 
 /**
  *
diff --git a/plugins/CoreUpdater/UpdateCommunication.php b/plugins/CoreUpdater/UpdateCommunication.php
index 5b4253f8f3..b94984045c 100644
--- a/plugins/CoreUpdater/UpdateCommunication.php
+++ b/plugins/CoreUpdater/UpdateCommunication.php
@@ -12,9 +12,9 @@ use Piwik\Config;
 use Piwik\Mail;
 use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 use Piwik\SettingsPiwik;
 use Piwik\UpdateCheck;
-use Piwik\Plugins\UsersManager\API as UsersManagerApi;
 
 /**
  * Class to check and notify users via email if there is a core update available.
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php
index debc716726..af9140fb97 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator.php
@@ -10,7 +10,6 @@
 namespace Piwik\Plugins\CoreVisualizations;
 
 use Exception;
-
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\Metrics;
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
index 87f98e7703..9ea703e9ed 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator/Chart.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\JqplotDataGenerator;
 
-use Piwik\Common;
 use Piwik\ProxyHttp;
 
 /**
diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php
index 6d90aab1ea..1e63c8f741 100644
--- a/plugins/CoreVisualizations/Visualizations/Graph.php
+++ b/plugins/CoreVisualizations/Visualizations/Graph.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugin\Visualization;
 
diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php
index c4f64767a0..5c8ac4d01f 100644
--- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php
+++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php
@@ -8,11 +8,11 @@
  */
 namespace Piwik\Plugins\CoreVisualizations\Visualizations;
 
-use Piwik\Plugin\Visualization;
-use Piwik\View;
+use Piwik\API\Request as ApiRequest;
 use Piwik\Common;
 use Piwik\Period;
-use Piwik\API\Request as ApiRequest;
+use Piwik\Plugin\Visualization;
+use Piwik\View;
 
 /**
  * DataTable visualization that shows DataTable data in an HTML table.
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index d7ae1ac015..1afcdef098 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -13,8 +13,8 @@ use Piwik\Config;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataArray;
 use Piwik\Metrics;
-use Piwik\Tracker;
 use Piwik\Tracker\GoalManager;
+use Piwik\Tracker;
 
 require_once PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/PiwikTracker.php';
 
diff --git a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
index 0f5419029c..ed4ae6bb21 100644
--- a/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
+++ b/plugins/CustomVariables/Commands/SetNumberOfCustomVariables.php
@@ -10,8 +10,8 @@
 namespace Piwik\Plugins\CustomVariables\Commands;
 
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Tracker\Cache;
 use Piwik\Plugins\CustomVariables\Model;
+use Piwik\Tracker\Cache;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/CustomVariables/Controller.php b/plugins/CustomVariables/Controller.php
index c673d51605..01b48bbac7 100644
--- a/plugins/CustomVariables/Controller.php
+++ b/plugins/CustomVariables/Controller.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\CustomVariables;
 
 use Piwik\Piwik;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 870c5f5340..8efed3ce7b 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -12,9 +12,9 @@ use Piwik\ArchiveProcessor;
 use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
+use Piwik\Tracker\Cache;
 use Piwik\Tracker;
 use Piwik\WidgetsList;
-use Piwik\Tracker\Cache;
 
 /**
  */
diff --git a/plugins/CustomVariables/tests/Commands/InfoTest.php b/plugins/CustomVariables/tests/Commands/InfoTest.php
index 586fbc09a8..d8bc90b88e 100644
--- a/plugins/CustomVariables/tests/Commands/InfoTest.php
+++ b/plugins/CustomVariables/tests/Commands/InfoTest.php
@@ -12,10 +12,10 @@ namespace Piwik\Plugins\CustomVariables\tests\Commands;
 use Piwik\Plugins\CustomVariables\Commands\Info;
 use Piwik\Plugins\CustomVariables\Model;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @group CustomVariables
diff --git a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
index 0fbbb9d299..a883f09d1f 100644
--- a/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
+++ b/plugins/CustomVariables/tests/Commands/SetNumberOfCustomVariablesTest.php
@@ -12,10 +12,10 @@ namespace Piwik\Plugins\CustomVariables\tests\Commands;
 use Piwik\Plugins\CustomVariables\Commands\SetNumberOfCustomVariables;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Symfony\Component\Console\Application;
-use Symfony\Component\Console\Tester\CommandTester;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Tester\CommandTester;
 
 /**
  * @group CustomVariables
diff --git a/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php b/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php
index fd4cc3cc1c..7559857a56 100644
--- a/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php
+++ b/plugins/CustomVariables/tests/CustomVariablesIntegrationTest.php
@@ -7,8 +7,6 @@
  */
 
 namespace Piwik\Plugins\CustomVariables\tests;
-use Piwik\Plugins\CustomVariables\CustomVariables;
-use Piwik\Tracker\Cache;
 
 /**
  * @group CustomVariables
diff --git a/plugins/DBStats/Controller.php b/plugins/DBStats/Controller.php
index 9b87194450..07f38a77e5 100644
--- a/plugins/DBStats/Controller.php
+++ b/plugins/DBStats/Controller.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\DBStats;
 use Piwik\MetricsFormatter;
 use Piwik\Piwik;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index 3f5a226696..d2a843e690 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -17,7 +17,6 @@ use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie;
 use Piwik\ScheduledTask;
-use Piwik\ScheduledTime\Weekly;
 use Piwik\ScheduledTime;
 
 /**
diff --git a/plugins/DBStats/MySQLMetadataDataAccess.php b/plugins/DBStats/MySQLMetadataDataAccess.php
index e5fee259a1..2b0a8ec4e6 100644
--- a/plugins/DBStats/MySQLMetadataDataAccess.php
+++ b/plugins/DBStats/MySQLMetadataDataAccess.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\Plugins\DBStats;
 
-use Piwik\Db;
+use Exception;
 use Piwik\Config;
-use \Exception;
+use Piwik\Db;
 
 /**
  * Data Access Object that serves MySQL stats.
diff --git a/plugins/DBStats/MySQLMetadataProvider.php b/plugins/DBStats/MySQLMetadataProvider.php
index b1d7be104f..64b059ea7c 100755
--- a/plugins/DBStats/MySQLMetadataProvider.php
+++ b/plugins/DBStats/MySQLMetadataProvider.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\DBStats;
 
 use Exception;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\DataTable;
 use Piwik\Db;
 use Piwik\DbHelper;
diff --git a/plugins/DBStats/tests/Mocks/MockDataAccess.php b/plugins/DBStats/tests/Mocks/MockDataAccess.php
index b394a2d599..32b6c58e0b 100644
--- a/plugins/DBStats/tests/Mocks/MockDataAccess.php
+++ b/plugins/DBStats/tests/Mocks/MockDataAccess.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\DBStats\Mocks;
 
-use Piwik\Piwik;
 use Piwik\Common;
 
 class MockDataAccess
diff --git a/plugins/Dashboard/DashboardManagerControl.php b/plugins/Dashboard/DashboardManagerControl.php
index af6303d2b0..d445d835be 100644
--- a/plugins/Dashboard/DashboardManagerControl.php
+++ b/plugins/Dashboard/DashboardManagerControl.php
@@ -7,8 +7,6 @@
  */
 namespace Piwik\Plugins\Dashboard;
 
-use Piwik\View\UIControl;
-
 /**
  * Generates the HTML for the dashboard manager control.
  */
diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php
index be2a2beac8..12b5750dcf 100644
--- a/plugins/DevicesDetection/Controller.php
+++ b/plugins/DevicesDetection/Controller.php
@@ -8,13 +8,12 @@
  */
 namespace Piwik\Plugins\DevicesDetection;
 
+use DeviceDetector;
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugin\ControllerAdmin;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
-use DeviceDetector;
 
 class Controller extends \Piwik\Plugin\Controller
 {
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 27d9ff4edb..a6b8b45149 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -9,19 +9,17 @@
 
 namespace Piwik\Plugins\DevicesDetection;
 
+use DeviceDetector;
 use Exception;
-
 use Piwik\ArchiveProcessor;
 use Piwik\CacheFile;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\WidgetsList;
-use DeviceDetector;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index d7dbf8d927..895b0ed33c 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -9,8 +9,8 @@
 
 namespace Piwik\Plugins\DevicesDetection;
 
-use Piwik\Piwik;
 use DeviceDetector;
+use Piwik\Piwik;
 
 function getBrandLogo($label)
 {
diff --git a/plugins/Events/API.php b/plugins/Events/API.php
index 0be6037596..bd41c6a0b8 100644
--- a/plugins/Events/API.php
+++ b/plugins/Events/API.php
@@ -9,8 +9,8 @@
 namespace Piwik\Plugins\Events;
 
 use Piwik\Archive;
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Piwik;
 
diff --git a/plugins/Events/Controller.php b/plugins/Events/Controller.php
index 87112ccc9a..576d8ae49b 100644
--- a/plugins/Events/Controller.php
+++ b/plugins/Events/Controller.php
@@ -8,10 +8,7 @@
  */
 namespace Piwik\Plugins\Events;
 
-use Piwik\Piwik;
-use Piwik\Plugins\Events\Events;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  * Events controller
diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php
index 638238350c..2c3fa728fc 100644
--- a/plugins/ExampleAPI/API.php
+++ b/plugins/ExampleAPI/API.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\ExampleAPI;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Version;
 
diff --git a/plugins/Feedback/Controller.php b/plugins/Feedback/Controller.php
index 24aeb1ee64..b0807b391c 100644
--- a/plugins/Feedback/Controller.php
+++ b/plugins/Feedback/Controller.php
@@ -8,14 +8,6 @@
  */
 namespace Piwik\Plugins\Feedback;
 
-use Exception;
-use Piwik\Common;
-use Piwik\Config;
-use Piwik\IP;
-use Piwik\Mail;
-use Piwik\Nonce;
-use Piwik\Piwik;
-use Piwik\Url;
 use Piwik\Version;
 use Piwik\View;
 
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 47ed50ac43..e6a090a9d0 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -11,14 +11,13 @@ namespace Piwik\Plugins\Goals;
 use Exception;
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
 use Piwik\DataTable;
+use Piwik\DataTable\Filter\AddColumnsProcessedMetricsGoal;
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\Referrers\API as APIReferrers;
-use Piwik\View\ReportsByDimension;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
+use Piwik\View\ReportsByDimension;
 
 /**
  *
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index e86738b1f0..cf0de46ab5 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\Goals;
 
 use Piwik\ArchiveProcessor;
-
 use Piwik\Common;
 use Piwik\Db;
 use Piwik\Menu\MenuMain;
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
index 46fc9bde64..10c20260db 100644
--- a/plugins/ImageGraph/StaticGraph.php
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -10,7 +10,6 @@
 namespace Piwik\Plugins\ImageGraph;
 
 use Exception;
-
 use pData;
 use pImage;
 use Piwik\Loader;
diff --git a/plugins/Insights/API.php b/plugins/Insights/API.php
index c36402a6ce..3d22aa5e6a 100644
--- a/plugins/Insights/API.php
+++ b/plugins/Insights/API.php
@@ -8,14 +8,9 @@
  */
 namespace Piwik\Plugins\Insights;
 
+use Piwik\API\Request as ApiRequest;
 use Piwik\DataTable;
-use Piwik\Date;
-use Piwik\Log;
-use Piwik\Period\Range;
 use Piwik\Piwik;
-use Piwik\Plugins\API\ProcessedReport;
-use Piwik\API\Request as ApiRequest;
-use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
 
 /**
  * API for plugin Insights
diff --git a/plugins/Insights/DataTable/Filter/MinGrowth.php b/plugins/Insights/DataTable/Filter/MinGrowth.php
index 21a1b549c5..fb1b86c15b 100644
--- a/plugins/Insights/DataTable/Filter/MinGrowth.php
+++ b/plugins/Insights/DataTable/Filter/MinGrowth.php
@@ -8,8 +8,8 @@
  */
 namespace Piwik\Plugins\Insights\DataTable\Filter;
 
-use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable;
+use Piwik\DataTable\BaseFilter;
 
 /**
  * A row will be deleted if a positive value of $columnToRead is lower than the $minPositiveValue or if the negative
diff --git a/plugins/Insights/Model.php b/plugins/Insights/Model.php
index 4245a48a74..981a7d26f0 100644
--- a/plugins/Insights/Model.php
+++ b/plugins/Insights/Model.php
@@ -8,10 +8,10 @@
  */
 namespace Piwik\Plugins\Insights;
 
+use Piwik\API\Request as ApiRequest;
 use Piwik\DataTable;
 use Piwik\Period\Range;
 use Piwik\Plugins\API\ProcessedReport;
-use Piwik\API\Request as ApiRequest;
 use Piwik\Plugins\VisitsSummary\API as VisitsSummaryAPI;
 
 /**
diff --git a/plugins/Insights/Visualizations/Insight.php b/plugins/Insights/Visualizations/Insight.php
index 0ec37c58f1..ca835679ca 100644
--- a/plugins/Insights/Visualizations/Insight.php
+++ b/plugins/Insights/Visualizations/Insight.php
@@ -11,11 +11,9 @@ namespace Piwik\Plugins\Insights\Visualizations;
 
 use Piwik\Common;
 use Piwik\DataTable;
-use Piwik\Period\Range;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugin\Visualization;
 use Piwik\Plugins\Insights\API;
-use Piwik\Plugins\Insights\Model;
 
 /**
  * InsightsVisualization Visualization.
diff --git a/plugins/Insights/tests/ApiTest.php b/plugins/Insights/tests/ApiTest.php
index cba3d57919..06223f1e63 100644
--- a/plugins/Insights/tests/ApiTest.php
+++ b/plugins/Insights/tests/ApiTest.php
@@ -7,10 +7,10 @@
  */
 
 namespace Piwik\Plugins\Insights\tests;
-use Piwik\DataTable\Row;
+use Piwik\API\Request as ApiRequest;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Plugins\Insights\API;
-use Piwik\API\Request as ApiRequest;
 use Piwik\Plugins\Insights\tests\Fixtures\SomeVisitsDifferentPathsOnTwoDays;
 
 /**
diff --git a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
index 76320ca83c..283ead6484 100644
--- a/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
+++ b/plugins/Insights/tests/Fixtures/SomeVisitsDifferentPathsOnTwoDays.php
@@ -9,6 +9,7 @@
 namespace Piwik\Plugins\Insights\tests\Fixtures;
 
 use Piwik\Date;
+
 /**
  * Adds one website and tracks several visits from one visitor on
  * different days that span about a month apart.
diff --git a/plugins/Insights/tests/InsightReportTest.php b/plugins/Insights/tests/InsightReportTest.php
index 3e50a2ba41..49041f8262 100644
--- a/plugins/Insights/tests/InsightReportTest.php
+++ b/plugins/Insights/tests/InsightReportTest.php
@@ -8,8 +8,8 @@
 
 namespace Piwik\Plugins\Insights\tests;
 
-use Piwik\DataTable;
 use Piwik\DataTable\Row;
+use Piwik\DataTable;
 use Piwik\Plugins\Insights\InsightReport;
 use Piwik\Plugins\Insights\Visualizations\Insight;
 
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index 3123ee12bc..a76136e70e 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -14,8 +14,8 @@ use Piwik\AssetManager;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\Db\Adapter;
 use Piwik\Db;
+use Piwik\Db\Adapter;
 use Piwik\DbHelper;
 use Piwik\Filesystem;
 use Piwik\Http;
diff --git a/plugins/Installation/FormDatabaseSetup.php b/plugins/Installation/FormDatabaseSetup.php
index ce4df518f5..8b847106a7 100644
--- a/plugins/Installation/FormDatabaseSetup.php
+++ b/plugins/Installation/FormDatabaseSetup.php
@@ -13,8 +13,8 @@ use HTML_QuickForm2_DataSource_Array;
 use HTML_QuickForm2_Factory;
 use HTML_QuickForm2_Rule;
 use Piwik\Config;
-use Piwik\Db\Adapter;
 use Piwik\Db;
+use Piwik\Db\Adapter;
 use Piwik\DbHelper;
 use Piwik\Filesystem;
 use Piwik\Piwik;
diff --git a/plugins/Installation/SystemCheck.php b/plugins/Installation/SystemCheck.php
index 16d55810ba..aff9603e0a 100644
--- a/plugins/Installation/SystemCheck.php
+++ b/plugins/Installation/SystemCheck.php
@@ -10,15 +10,14 @@ namespace Piwik\Plugins\Installation;
 
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\Db\Adapter;
 use Piwik\Db;
+use Piwik\Db\Adapter;
 use Piwik\DbHelper;
 use Piwik\Filechecks;
 use Piwik\Filesystem;
 use Piwik\Http;
 use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\ProxyHeaders;
 use Piwik\SettingsServer;
 
 class SystemCheck
diff --git a/plugins/LanguagesManager/Commands/CreatePull.php b/plugins/LanguagesManager/Commands/CreatePull.php
index 0aede4ece7..3001f345b5 100644
--- a/plugins/LanguagesManager/Commands/CreatePull.php
+++ b/plugins/LanguagesManager/Commands/CreatePull.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\LanguagesManager\Commands;
 
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\Plugins\LanguagesManager\API;
-use Piwik\Plugins\LanguagesManager\Commands\Update;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/LanguagesManager/Controller.php b/plugins/LanguagesManager/Controller.php
index 7240c1fba8..8763d51f44 100644
--- a/plugins/LanguagesManager/Controller.php
+++ b/plugins/LanguagesManager/Controller.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\LanguagesManager;
 
 use Piwik\Common;
 use Piwik\DbHelper;
-use Piwik\Piwik;
 use Piwik\Url;
 
 /**
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index cd6fb6916e..fbb9dcf39a 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -12,7 +12,6 @@ namespace Piwik\Plugins\LanguagesManager;
 use Exception;
 use Piwik\Common;
 use Piwik\Config;
-
 use Piwik\Cookie;
 use Piwik\Db;
 use Piwik\DbHelper;
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index bbc23cc08c..de41680fb2 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -11,13 +11,13 @@ namespace Piwik\Plugins\Live;
 use Exception;
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\MetricsFormatter;
-use Piwik\Period;
 use Piwik\Period\Range;
+use Piwik\Period;
 use Piwik\Piwik;
 use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 06adb63627..efdde7e9fd 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -16,7 +16,6 @@ use Piwik\Piwik;
 use Piwik\Plugins\Goals\API as APIGoals;
 use Piwik\Url;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 9e13d9b514..0eca7043c3 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -19,9 +19,9 @@ use Piwik\Plugins\API\API as APIMetadata;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Piwik\Plugins\Referrers\API as APIReferrers;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Tracker;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\GoalManager;
-use Piwik\Tracker;
 use Piwik\Tracker\Visit;
 use Piwik\UrlHelper;
 
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index 9b7744e2ea..e18ea350d4 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -18,7 +18,6 @@ use Piwik\Nonce;
 use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\API;
 use Piwik\Plugins\UsersManager\UsersManager;
-use Piwik\ProxyHttp;
 use Piwik\QuickForm2;
 use Piwik\Session;
 use Piwik\SettingsPiwik;
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 102529e48a..19ec7a241c 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -12,7 +12,6 @@ use Exception;
 use Piwik\API\Request;
 use Piwik\Archive;
 use Piwik\Common;
-use Piwik\DataTable\Filter\CalculateEvolutionFilter;
 use Piwik\DataTable;
 use Piwik\Period\Range;
 use Piwik\Piwik;
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index c42d00ca60..1802d2f139 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -11,12 +11,8 @@ namespace Piwik\Plugins\MultiSites;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
-use Piwik\MetricsFormatter;
 use Piwik\Period;
 use Piwik\Piwik;
-use Piwik\Plugins\MultiSites\API as APIMultiSites;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
-use Piwik\Site;
 use Piwik\View;
 
 /**
diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php
index 29da25a76c..10b05cac5c 100644
--- a/plugins/PrivacyManager/PrivacyManager.php
+++ b/plugins/PrivacyManager/PrivacyManager.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\PrivacyManager;
 
-use Exception;
 use Piwik\Common;
 use Piwik\Config as PiwikConfig;
 use Piwik\DataTable\DataTableInterface;
@@ -17,8 +16,8 @@ use Piwik\Db;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Metrics;
 use Piwik\Option;
-use Piwik\Period\Range;
 use Piwik\Period;
+use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\ScheduledTask;
diff --git a/plugins/Provider/Controller.php b/plugins/Provider/Controller.php
index 03a702e47f..f46250792f 100644
--- a/plugins/Provider/Controller.php
+++ b/plugins/Provider/Controller.php
@@ -8,8 +8,6 @@
  */
 namespace Piwik\Plugins\Provider;
 
-use Piwik\ViewDataTable\Factory;
-
 /**
  *
  */
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 4e9b2c62cf..9a10b89a27 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -11,8 +11,6 @@ namespace Piwik\Plugins\Provider;
 use Exception;
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
-use Piwik\Config;
-
 use Piwik\Db;
 use Piwik\FrontController;
 use Piwik\IP;
diff --git a/plugins/Referrers/Controller.php b/plugins/Referrers/Controller.php
index feaba305eb..988e0019de 100644
--- a/plugins/Referrers/Controller.php
+++ b/plugins/Referrers/Controller.php
@@ -15,9 +15,7 @@ use Piwik\Metrics;
 use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\SettingsPiwik;
-use Piwik\Url;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/Referrers/Referrers.php b/plugins/Referrers/Referrers.php
index df197d49b3..9a567b16d6 100644
--- a/plugins/Referrers/Referrers.php
+++ b/plugins/Referrers/Referrers.php
@@ -13,8 +13,8 @@ use Piwik\Common;
 use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable\AllColumns;
 use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable;
+use Piwik\Plugins\CoreVisualizations\Visualizations\HtmlTable\AllColumns;
 use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Pie;
 use Piwik\SettingsPiwik;
 use Piwik\WidgetsList;
diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php
index 588254bfb4..22976b3cd7 100644
--- a/plugins/SEO/RankChecker.php
+++ b/plugins/SEO/RankChecker.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\SEO;
 
 use Exception;
-
 use Piwik\Http;
 use Piwik\Log;
 use Piwik\MetricsFormatter;
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index e5926e1b44..26d5159dd3 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -17,8 +17,8 @@ use Piwik\Piwik;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
 use Piwik\Plugins\SitesManager\API as SitesManagerApi;
-use Piwik\ReportRenderer;
 use Piwik\ReportRenderer\Html;
+use Piwik\ReportRenderer;
 use Piwik\Site;
 use Piwik\Translate;
 use Zend_Mime;
diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php
index e4854d465f..580056aca7 100644
--- a/plugins/ScheduledReports/ScheduledReports.php
+++ b/plugins/ScheduledReports/ScheduledReports.php
@@ -10,13 +10,11 @@ namespace Piwik\Plugins\ScheduledReports;
 
 use Exception;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\Mail;
 use Piwik\Menu\MenuTop;
 use Piwik\Piwik;
-use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
diff --git a/plugins/SegmentEditor/Model.php b/plugins/SegmentEditor/Model.php
index a58f25385c..68b3fcff53 100644
--- a/plugins/SegmentEditor/Model.php
+++ b/plugins/SegmentEditor/Model.php
@@ -8,12 +8,8 @@
  */
 namespace Piwik\Plugins\SegmentEditor;
 
-use Exception;
 use Piwik\Common;
-use Piwik\Date;
 use Piwik\Db;
-use Piwik\Piwik;
-use Piwik\Segment;
 
 /**
  * The SegmentEditor Model lets you persist and read custom Segments from the backend without handling any logic.
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index c7dd76620c..cc08f2a952 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -8,11 +8,8 @@
  */
 namespace Piwik\Plugins\SegmentEditor;
 
-use Exception;
-use Piwik\Common;
 use Piwik\Db;
 use Piwik\DbHelper;
-use Piwik\Piwik;
 use Piwik\Version;
 
 /**
diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php
index 3baf42679e..366a5a1233 100644
--- a/plugins/SitesManager/API.php
+++ b/plugins/SitesManager/API.php
@@ -17,6 +17,7 @@ use Piwik\IP;
 use Piwik\MetricsFormatter;
 use Piwik\Option;
 use Piwik\Piwik;
+use Piwik\ProxyHttp;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Site;
@@ -24,7 +25,6 @@ use Piwik\TaskScheduler;
 use Piwik\Tracker\Cache;
 use Piwik\Url;
 use Piwik\UrlHelper;
-use Piwik\ProxyHttp;
 
 /**
  * The SitesManager API gives you full control on Websites in Piwik (create, update and delete), and many methods to retrieve websites based on various attributes.
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index b315e3cd84..60e13b96f7 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -11,15 +11,12 @@ namespace Piwik\Plugins\SitesManager;
 use Exception;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
-use Piwik\DataTable\Renderer\Json;
 use Piwik\Date;
 use Piwik\IP;
 use Piwik\Piwik;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
 use Piwik\Site;
-use Piwik\Url;
-use Piwik\UrlHelper;
 use Piwik\View;
 
 /**
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 21cd3ff2a3..5664e1b766 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -14,9 +14,9 @@ use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataArray;
+use Piwik\DataTable;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Row;
-use Piwik\DataTable;
 use Piwik\Metrics;
 use Piwik\Period;
 use Piwik\Piwik;
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index d60111d97d..31967e5c60 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\UserCountry;
 use Exception;
 use Piwik\Archive;
 use Piwik\DataTable;
-
 use Piwik\Metrics;
 use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider;
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index 7b9a634b76..302866b41f 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -14,13 +14,12 @@ use Piwik\DataTable\Renderer\Json;
 use Piwik\Http;
 use Piwik\IP;
 use Piwik\Piwik;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Pecl;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\ServerBased;
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php
index 5699e7b80c..a26807fb20 100755
--- a/plugins/UserCountry/GeoIPAutoUpdater.php
+++ b/plugins/UserCountry/GeoIPAutoUpdater.php
@@ -17,9 +17,9 @@ use Piwik\Http;
 use Piwik\Log;
 use Piwik\Option;
 use Piwik\Piwik;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Php;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\ScheduledTask;
 use Piwik\ScheduledTaskTimetable;
 use Piwik\ScheduledTime\Monthly;
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
index 075dfa778d..234690e35e 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
@@ -12,8 +12,8 @@ namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Common;
 use Piwik\IP;
 use Piwik\Piwik;
-use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
 
 /**
  * A LocationProvider that uses an GeoIP module installed in an HTTP Server.
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index 0f33f5cfe8..ddeb61521f 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -17,10 +17,10 @@ use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
 use Piwik\Plugin\ViewDataTable;
-use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
-use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
+use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
+use Piwik\Plugins\UserCountry\LocationProvider;
+use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
 use Piwik\Url;
 use Piwik\WidgetsList;
 
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index 8e44340f86..0c52344c0f 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\UserSettings;
 
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index ad59009ec9..efc77ac9b9 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -11,16 +11,16 @@ namespace Piwik\Plugins\UsersManager;
 use Exception;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
+use Piwik\MetricsFormatter;
 use Piwik\Piwik;
+use Piwik\Plugins\LanguagesManager\API as APILanguagesManager;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Plugins\LanguagesManager\API as APILanguagesManager;
 use Piwik\Site;
 use Piwik\Tracker\IgnoreCookie;
 use Piwik\Url;
 use Piwik\View;
-use Piwik\MetricsFormatter;
 
 /**
  *
diff --git a/plugins/UsersManager/LastSeenTimeLogger.php b/plugins/UsersManager/LastSeenTimeLogger.php
index 46d60ad1ca..82928b39ea 100644
--- a/plugins/UsersManager/LastSeenTimeLogger.php
+++ b/plugins/UsersManager/LastSeenTimeLogger.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\Plugins\UsersManager;
 
-use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Option;
+use Piwik\Piwik;
 
 /**
  * Class that logs the time the current user is accessing the current resource (which
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php
index e837fee01d..2997202226 100644
--- a/plugins/VisitFrequency/API.php
+++ b/plugins/VisitFrequency/API.php
@@ -9,13 +9,11 @@
 namespace Piwik\Plugins\VisitFrequency;
 
 use Piwik\API\Request;
+use Piwik\Archive;
 use Piwik\DataTable;
 use Piwik\Piwik;
-use Piwik\Common;
-use Piwik\Archive;
-use Piwik\SegmentExpression;
-use Piwik\SettingsPiwik;
 use Piwik\Plugins\VisitsSummary\API as APIVisitsSummary;
+use Piwik\SegmentExpression;
 
 /**
  * VisitFrequency API lets you access a list of metrics related to Returning Visitors.
diff --git a/plugins/VisitTime/Controller.php b/plugins/VisitTime/Controller.php
index 59a254c4c2..0bd7b00f53 100644
--- a/plugins/VisitTime/Controller.php
+++ b/plugins/VisitTime/Controller.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\VisitTime;
 
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  *
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 93e8d9ca35..a3201fc3f9 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\VisitTime;
 
 use Exception;
-
 use Piwik\ArchiveProcessor;
 use Piwik\Common;
 use Piwik\Menu\MenuMain;
diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php
index 239abd2ffc..1880532286 100644
--- a/plugins/VisitorInterest/Controller.php
+++ b/plugins/VisitorInterest/Controller.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\VisitorInterest;
 
 use Piwik\View;
-use Piwik\ViewDataTable\Factory;
 
 /**
  */
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 638f5feee2..fbdda4dc1f 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -10,8 +10,8 @@ namespace Piwik\Plugins\VisitsSummary;
 
 use Piwik\API\Request;
 use Piwik\Common;
-use Piwik\DataTable\Row;
 use Piwik\DataTable;
+use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugins\Actions\API as APIActions;
 use Piwik\Site;