diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 418ef7aed5971a520a4084ff83f5fb6f269f11b2..45bebbf4ac818804c5c4e41d725c0daa7a52a9b7 100644
--- a/core/API/DataTableManipulator.php
+++ b/core/API/DataTableManipulator.php
@@ -15,8 +15,6 @@ use Piwik\DataTable\Row;
use Piwik\Period\Range;
use Piwik\DataTable;
use Piwik\Plugins\API\API;
-use Piwik\API\Proxy;
-use Piwik\API\ResponseBuilder;
/**
* Base class for manipulating data tables.
diff --git a/core/API/DocumentationGenerator.php b/core/API/DocumentationGenerator.php
index a419895a427cb2945b38804dc6d483c04ccf6563..a7e2559aca13e49f22309bbff16f93456ec2ee9e 100644
--- a/core/API/DocumentationGenerator.php
+++ b/core/API/DocumentationGenerator.php
@@ -13,7 +13,7 @@ namespace Piwik\API;
use Exception;
use Piwik\Piwik;
use Piwik\Common;
-use Piwik\API\Proxy;
+
use Piwik\Url;
use Piwik\PluginsManager;
diff --git a/core/API/ResponseBuilder.php b/core/API/ResponseBuilder.php
index 87da4a0b3253bd19b1fe37ab3493df82d76ef4f5..7aeb474e020021042d5e5e425fe744258969e1b6 100644
--- a/core/API/ResponseBuilder.php
+++ b/core/API/ResponseBuilder.php
@@ -13,7 +13,7 @@ namespace Piwik\API;
use Exception;
use Piwik\API\DataTableManipulator\Flattener;
use Piwik\API\DataTableManipulator\LabelFilter;
-use Piwik\API\DataTableGenericFilter;
+
use Piwik\DataTable\Renderer\Json;
use Piwik\DataTable\Simple;
use Piwik\DataTable\Renderer;
diff --git a/core/Access.php b/core/Access.php
index 6e13db6579fd065ff7672763f441d15e429a03ab..2f2d3691859c126f3b3c44399ecaa642c7efbe5d 100644
--- a/core/Access.php
+++ b/core/Access.php
@@ -10,10 +10,6 @@
*/
namespace Piwik;
-use Piwik\Config;
-use Piwik\Common;
-use Piwik\Auth;
-use Piwik\Site;
use Piwik\Db;
/**
diff --git a/core/Archive.php b/core/Archive.php
index 694cf55e057ba1ea71218dc138e2119d88744de6..05c6dc2ab3bc55ad361c3773f73b07431884a572 100644
--- a/core/Archive.php
+++ b/core/Archive.php
@@ -11,10 +11,7 @@
namespace Piwik;
use Piwik\Archive\Parameters;
use Piwik\Period\Range;
-use Piwik\Piwik;
-use Piwik\Metrics;
-use Piwik\Date;
-use Piwik\Log;
+
use Piwik\ArchiveProcessor\Rules;
use Piwik\DataAccess\ArchiveSelector;
diff --git a/core/Archive/DataCollection.php b/core/Archive/DataCollection.php
index d37c4d5b5ceae1f1cbdcc5a01e98b3f07fce498a..0bc89d5bbd1284617b8da01b44d9219c2ca9468d 100644
--- a/core/Archive/DataCollection.php
+++ b/core/Archive/DataCollection.php
@@ -12,7 +12,7 @@
namespace Piwik\Archive;
use Exception;
-use Piwik\Archive\DataTableFactory;
+
use Piwik\DataTable;
/**
diff --git a/core/ArchiveProcessor.php b/core/ArchiveProcessor.php
index 70d8e3fe3a20ba0188c62ad0c19131a37a2fa2a1..09576d8c65709699f9d96ade8bd081623cc9d75f 100644
--- a/core/ArchiveProcessor.php
+++ b/core/ArchiveProcessor.php
@@ -11,17 +11,13 @@
namespace Piwik;
use Exception;
use Piwik\ArchiveProcessor\Rules;
-use Piwik\Config;
+
use Piwik\Period;
-use Piwik\Piwik;
-use Piwik\Date;
-use Piwik\Segment;
-use Piwik\Site;
+
use Piwik\Db;
use Piwik\DataAccess\ArchiveSelector;
use Piwik\DataAccess\ArchiveWriter;
use Piwik\DataAccess\LogAggregator;
-use Piwik\Log;
/**
* The ArchiveProcessor class is used by the Archive object to make sure the given Archive is processed and available in the DB.
diff --git a/core/Controller.php b/core/Controller.php
index 6f46eb1d720b09d5f729c7da20d2966f930e74e9..bcd451659496570dc10413d8ce2eba799d27b418 100644
--- a/core/Controller.php
+++ b/core/Controller.php
@@ -20,7 +20,7 @@ use Piwik\Plugins\API\API;
use Piwik\Plugins\LanguagesManager\LanguagesManager;
use Piwik\Plugins\SitesManager\API as APISitesManager;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Registry;
+
use Piwik\View;
use Piwik\ViewDataTable;
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index 21692f460ab217e4c00285461247f0d1e14f246c..c072ac751e175b8b83dcb64ed4c55a56eefb67a7 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -20,7 +20,7 @@ use Piwik\Date;
use Piwik\ArchiveProcessor;
use Piwik\Segment;
use Piwik\Site;
-use Piwik\DataAccess\ArchiveTableCreator;
+
use Piwik\Db;
use Piwik\Log;
diff --git a/core/DataAccess/ArchiveWriter.php b/core/DataAccess/ArchiveWriter.php
index e29d7eed6ca7ca6d9792a3254ea05e833386ddd6..b3538b5b79f27b6c69d7014d51473c80b826b466 100644
--- a/core/DataAccess/ArchiveWriter.php
+++ b/core/DataAccess/ArchiveWriter.php
@@ -18,7 +18,7 @@ use Piwik\Config;
use Piwik\Db;
use Piwik\Db\BatchInsert;
use Piwik\Period;
-use Piwik\Piwik;
+
use Piwik\Segment;
use Piwik\SettingsPiwik;
use Piwik\Log;
diff --git a/core/DataAccess/LogAggregator.php b/core/DataAccess/LogAggregator.php
index 34a9dd831c7b6d33e64981b2705517531e743086..080a71d846105173c50e51e36685af28933df8e6 100644
--- a/core/DataAccess/LogAggregator.php
+++ b/core/DataAccess/LogAggregator.php
@@ -16,7 +16,7 @@ use Piwik\Metrics;
use Piwik\Date;
use Piwik\Segment;
use Piwik\Site;
-use Piwik\RankingQuery;
+
use Piwik\Db;
use Piwik\Tracker\GoalManager;
diff --git a/core/DataArray.php b/core/DataArray.php
index 5c2570392d3198eead3afd11e1ff0e7b38d9b32b..8c22414821d4a57d9e721857918a5a48038135f9 100644
--- a/core/DataArray.php
+++ b/core/DataArray.php
@@ -11,7 +11,7 @@
namespace Piwik;
use Exception;
-use Piwik\Metrics;
+
use Piwik\Tracker\GoalManager;
/**
diff --git a/core/DataTable.php b/core/DataTable.php
index 5760483c95d3a763ae6082c7ec654d30c63d8751..08eb02ea79791fba060fa72a9f33a44c02903800 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -13,7 +13,7 @@ namespace Piwik;
use Closure;
use Exception;
-use Piwik\Common;
+
use Piwik\DataTable\Manager;
use Piwik\DataTable\Renderer\Html;
use Piwik\DataTable\Row;
diff --git a/core/DataTable/Filter.php b/core/DataTable/Filter.php
index 43cb33f2a04cef7b890a569932b69b359a1f43a2..5b79a0c8bc1da79bccce4b1a3228742f46b55e6d 100644
--- a/core/DataTable/Filter.php
+++ b/core/DataTable/Filter.php
@@ -12,7 +12,7 @@ namespace Piwik\DataTable;
use Exception;
use Piwik\DataTable;
-use Piwik\DataTable\Manager;
+
use Piwik\DataTable\Row;
/**
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
index 32fc8df72b5c1cc6692303ec633196fb34910eb9..8fa4af3f348e52c7b5546b14aaa990b2e9fb9a91 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
@@ -12,7 +12,7 @@ namespace Piwik\DataTable\Filter;
use Exception;
use Piwik\DataTable;
-use Piwik\DataTable\Filter\AddColumnsProcessedMetrics;
+
use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\Tracker\GoalManager;
diff --git a/core/DataTable/Filter/BeautifyRangeLabels.php b/core/DataTable/Filter/BeautifyRangeLabels.php
index 5e2c0c1336dee776560b61278564ab34b7a41211..917ba1c2a77b8f2d94d429af7d273d4cd28890a5 100644
--- a/core/DataTable/Filter/BeautifyRangeLabels.php
+++ b/core/DataTable/Filter/BeautifyRangeLabels.php
@@ -11,7 +11,6 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter\ColumnCallbackReplace;
/**
* A DataTable filter that replaces range label columns with prettier,
diff --git a/core/DataTable/Filter/BeautifyTimeRangeLabels.php b/core/DataTable/Filter/BeautifyTimeRangeLabels.php
index f8fcb59b77b7cf3354ddc7c928276dc59c952653..997ea2e70c474e2db5a6cbd03c77ab204bc3c28c 100644
--- a/core/DataTable/Filter/BeautifyTimeRangeLabels.php
+++ b/core/DataTable/Filter/BeautifyTimeRangeLabels.php
@@ -11,7 +11,6 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter\BeautifyRangeLabels;
/**
* A DataTable filter replaces range labels that are in seconds with
diff --git a/core/DataTable/Filter/CalculateEvolutionFilter.php b/core/DataTable/Filter/CalculateEvolutionFilter.php
index 68d26b33d49ad343ce13a1f264a8b4af096182f6..a0b8e0c14ca27a217798a8b8ab7be4c4190e454f 100755
--- a/core/DataTable/Filter/CalculateEvolutionFilter.php
+++ b/core/DataTable/Filter/CalculateEvolutionFilter.php
@@ -13,7 +13,6 @@ namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
use Piwik\DataTable\Row;
use Piwik\Site;
-use Piwik\DataTable\Filter\ColumnCallbackAddColumnPercentage;
/**
* A DataTable filter that calculates the evolution of a metric and adds
diff --git a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php
index d22c61a83fb6a4fb4cd50cebe50744a82b7ddb5e..689a64a204f4e53f1f43451d155c8e4ee3d54d3d 100644
--- a/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php
+++ b/core/DataTable/Filter/ColumnCallbackAddColumnPercentage.php
@@ -11,7 +11,6 @@
namespace Piwik\DataTable\Filter;
use Piwik\Piwik;
-use Piwik\DataTable\Filter\ColumnCallbackAddColumnQuotient;
/**
* Add a new column to the table which is a percentage based on the value resulting
diff --git a/core/DataTable/Filter/ColumnCallbackReplace.php b/core/DataTable/Filter/ColumnCallbackReplace.php
index 4b2110eff3ac1b7cd387ef549763450813ac631d..26f1b12433394e57e16a7492a83c71893ca7a65b 100644
--- a/core/DataTable/Filter/ColumnCallbackReplace.php
+++ b/core/DataTable/Filter/ColumnCallbackReplace.php
@@ -13,7 +13,6 @@ namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
use Piwik\DataTable\Filter;
use Piwik\DataTable\Row;
-use Piwik\Piwik;
/**
* Replace a column value with a new value resulting
diff --git a/core/DataTable/Filter/MetadataCallbackReplace.php b/core/DataTable/Filter/MetadataCallbackReplace.php
index e10119c9fe5b06ce8bc6c3a4a33be118e521e0de..56f9b6b056b9d8a8e95403e573a96a99d85afa4d 100644
--- a/core/DataTable/Filter/MetadataCallbackReplace.php
+++ b/core/DataTable/Filter/MetadataCallbackReplace.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable\Filter;
use Piwik\DataTable;
-use Piwik\DataTable\Filter\ColumnCallbackReplace;
+
use Piwik\DataTable\Row;
/**
diff --git a/core/DataTable/Filter/PatternRecursive.php b/core/DataTable/Filter/PatternRecursive.php
index 168c6a520aae74f1be636e9fd40d85836272e671..9f98af0209a1c3a64e34665207fa7eaa67bbcdaa 100644
--- a/core/DataTable/Filter/PatternRecursive.php
+++ b/core/DataTable/Filter/PatternRecursive.php
@@ -13,7 +13,7 @@ namespace Piwik\DataTable\Filter;
use Exception;
use Piwik\DataTable;
use Piwik\DataTable\Filter;
-use Piwik\DataTable\Filter\Pattern;
+
use Piwik\DataTable\Manager;
/**
diff --git a/core/DataTable/Renderer.php b/core/DataTable/Renderer.php
index 2872889f6f4635b0cd50477a24174c356a87bd5e..1d82e1c52fd6f733b1c24e81874e1e41d529634a 100644
--- a/core/DataTable/Renderer.php
+++ b/core/DataTable/Renderer.php
@@ -15,7 +15,6 @@ use Piwik\Loader;
use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\DataTable;
-use Piwik\DataTable\Simple;
/**
* A DataTable Renderer can produce an output given a DataTable object.
diff --git a/core/DataTable/Renderer/Tsv.php b/core/DataTable/Renderer/Tsv.php
index 3f6aea5b53c6af84be5205a60427bec80da0e19c..97c9b8875ae6ed4c284692a2ff41f5138c995c46 100644
--- a/core/DataTable/Renderer/Tsv.php
+++ b/core/DataTable/Renderer/Tsv.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\DataTable\Renderer;
-use Piwik\DataTable\Renderer\Csv;
+
/**
* TSV export
diff --git a/core/DataTable/Renderer/Xml.php b/core/DataTable/Renderer/Xml.php
index cabfb50f62ea75b00f858c2e5dee439c84b72880..4e2d251cd6cbfe5fb9a9a48e0483e167dcf50f7d 100644
--- a/core/DataTable/Renderer/Xml.php
+++ b/core/DataTable/Renderer/Xml.php
@@ -13,7 +13,7 @@ namespace Piwik\DataTable\Renderer;
use Exception;
use Piwik\DataTable;
use Piwik\DataTable\Map;
-use Piwik\DataTable\Renderer\Php;
+
use Piwik\DataTable\Simple;
use Piwik\DataTable\Renderer;
use Piwik\Piwik;
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index 8a3cde70c6940fd3d2183d391e9e6a58d95b9462..f0e1303a6466c50e5a2295c180da0fea335e6362 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -11,7 +11,7 @@
namespace Piwik\DataTable;
use Exception;
-use Piwik\DataTable\Manager;
+
use Piwik\Metrics;
use Piwik\DataTable;
diff --git a/core/Db.php b/core/Db.php
index d795a9b3f6056adf46232c810b26126154839f24..e6b7e8e1b44b105f77a44dbe02d7bf4f18bce020 100644
--- a/core/Db.php
+++ b/core/Db.php
@@ -13,7 +13,6 @@ namespace Piwik;
use Exception;
use Piwik\Db\Adapter;
use Piwik\Tracker;
-use Piwik\Config;
/**
* SQL wrapper
diff --git a/core/Db/Adapter.php b/core/Db/Adapter.php
index 55283b608d2c45448064d98e02de47c664e96108..dbcff64b596704a4b856baa4b5e09a9707f62076 100644
--- a/core/Db/Adapter.php
+++ b/core/Db/Adapter.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Db;
-use Piwik\Db\AdapterInterface;
+
use Piwik\Loader;
use Zend_Db_Table;
diff --git a/core/Db/BatchInsert.php b/core/Db/BatchInsert.php
index c7bc3184de5ef5eb982cf9bb640e9e933f1f4780..f5cca965ea55749c94135528ded6eed6d5ce067c 100644
--- a/core/Db/BatchInsert.php
+++ b/core/Db/BatchInsert.php
@@ -17,7 +17,7 @@ use Piwik\Config;
use Piwik\Log;
use Piwik\Db;
use Piwik\DbHelper;
-use Piwik\Piwik;
+
use Piwik\SettingsPiwik;
use Piwik\SettingsServer;
diff --git a/core/Error.php b/core/Error.php
index b186cdd7312b0f05af0fe399bb53377cd92ec316..dd6aac105b2740185c842ba5c553046d35c87fb4 100644
--- a/core/Error.php
+++ b/core/Error.php
@@ -10,9 +10,6 @@
*/
namespace Piwik;
-use Piwik\Log;
-use Piwik\Version;
-
/**
* Holds PHP error information (non-exception errors). Also contains log formatting logic
* for PHP errors and Piwik's error handler function.
diff --git a/core/EventDispatcher.php b/core/EventDispatcher.php
index 641e654252e851422080f9b7fcc7f08cfa5af1d3..5122250b084ea34ef3fc776740b09d241b7b98d8 100644
--- a/core/EventDispatcher.php
+++ b/core/EventDispatcher.php
@@ -11,7 +11,6 @@
namespace Piwik;
use Piwik\Plugin;
-use Piwik\PluginsManager;
/**
* This class allows code to post events from anywhere in Piwik and for
diff --git a/core/FrontController.php b/core/FrontController.php
index 7f93fd444bed2dd65244e9cce4940d7b874b876a..1321aae0cc30e22b7ee49bb7060845ad977cf24d 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -14,7 +14,6 @@ use Exception;
use Piwik\API\Request;
use Piwik\API\ResponseBuilder;
use Piwik\Session;
-use Piwik\Registry;
/**
* Front controller.
diff --git a/core/Http.php b/core/Http.php
index 911f1f5f32f74b14bf571ffc6faabc7eeff10485..78b18ea5284a3c8eca07582a301499324f967b18 100644
--- a/core/Http.php
+++ b/core/Http.php
@@ -11,7 +11,6 @@
namespace Piwik;
use Exception;
-use Piwik\Log;
/**
* Server-side http client to retrieve content from remote servers, and optionally save to a local file.
diff --git a/core/IP.php b/core/IP.php
index 73200b485713300dfe28f1f1cdd851e332e068c0..81df27bef35678640235d63a8746df90fbf9e7c9 100644
--- a/core/IP.php
+++ b/core/IP.php
@@ -11,9 +11,6 @@
namespace Piwik;
-use Piwik\Config;
-use Piwik\Common;
-
/**
* Handling IP addresses (both IPv4 and IPv6).
*
diff --git a/core/Log.php b/core/Log.php
index c3da2871d3599dfc1f9bf40a742ae3581517bcfa..8a2548b915d0225383843d91281569caecc26e42 100644
--- a/core/Log.php
+++ b/core/Log.php
@@ -10,7 +10,7 @@
*/
namespace Piwik;
-use Piwik\Common;
+
use Piwik\Db;
/**
diff --git a/core/Menu/Main.php b/core/Menu/Main.php
index 828f82517aed91645f22f037dcfde76fd5591e2c..52b64262edc1ca83375f6b7d660f53439c00a4db 100644
--- a/core/Menu/Main.php
+++ b/core/Menu/Main.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Menu;
-use Piwik\Menu\MenuAbstract;
+
/**
* @package Piwik_Menu
diff --git a/core/Menu/Top.php b/core/Menu/Top.php
index 31c8fbb86af3b61f5fe13e24949dd5b3b82ff144..b39ce1b30f299a5105fd640aff06bb9e6f74e798 100644
--- a/core/Menu/Top.php
+++ b/core/Menu/Top.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Menu;
-use Piwik\Menu\MenuAbstract;
+
/**
* @package Piwik_Menu
diff --git a/core/Option.php b/core/Option.php
index dab41eac1ebd22fbe44fb2bd2eefccf3c0b0ed40..e4a33480ddd1ef2f5513a0144fd221c72d050ab4 100644
--- a/core/Option.php
+++ b/core/Option.php
@@ -9,7 +9,7 @@
* @package Piwik
*/
namespace Piwik;
-use Piwik\Common;
+
/**
* Option provides a very simple mechanism to save/retrieve key-values pair
diff --git a/core/Period.php b/core/Period.php
index b8867cbea53082c874f3615eee40e51f90902aa4..f875e893113670b69cc7a233dc2262725b1052ef 100644
--- a/core/Period.php
+++ b/core/Period.php
@@ -10,8 +10,7 @@
*/
namespace Piwik;
use Exception;
-use Piwik\Piwik;
-use Piwik\Date;
+
use Piwik\Period\Day;
use Piwik\Period\Month;
use Piwik\Period\Range;
diff --git a/core/Period/Month.php b/core/Period/Month.php
index 78ac50538eead7ba9ce27b5456f85547cbac33c9..0650f44883179fb03a36f54428cf7d4d88d7ebbf 100644
--- a/core/Period/Month.php
+++ b/core/Period/Month.php
@@ -11,7 +11,6 @@
namespace Piwik\Period;
use Piwik\Period;
-use Piwik\Period\Day;
/**
* @package Piwik
diff --git a/core/Period/Range.php b/core/Period/Range.php
index 06bd605311e647eff80fa9686c89975ad2effed3..48406fb83c1cafb4bcb1452cf7f6921ab897a873 100644
--- a/core/Period/Range.php
+++ b/core/Period/Range.php
@@ -14,8 +14,6 @@ use Exception;
use Piwik\Common;
use Piwik\Period;
use Piwik\Date;
-use Piwik\Period\Month;
-use Piwik\Period\Week;
/**
* from a starting date to an ending date
diff --git a/core/Period/Week.php b/core/Period/Week.php
index dd4b1d9c06110394b6ca4c60795bd03dda0cc8bb..e016da3ff5b311d134f37d5226daf70fcaaf004a 100644
--- a/core/Period/Week.php
+++ b/core/Period/Week.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Period;
-use Piwik\Period\Day;
+
use Piwik\Period;
/**
diff --git a/core/Period/Year.php b/core/Period/Year.php
index 393c0b6878c4b6dfa43750ebd1d97e5a564a70eb..d6fa96491659731956d4d0ff5b263b992924e152 100644
--- a/core/Period/Year.php
+++ b/core/Period/Year.php
@@ -12,7 +12,6 @@ namespace Piwik\Period;
use Piwik\Period;
use Piwik\Date;
-use Piwik\Period\Month;
/**
* @package Piwik
diff --git a/core/Piwik.php b/core/Piwik.php
index 1b59f48e2cb9e6ffd8e013ded0782500496b6b8b..4299f2673c8f29f0cecfa691e196a872297055c6 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -16,7 +16,7 @@ use Piwik\Db\Schema;
use Piwik\Db;
use Piwik\Plugin;
use Piwik\Plugins\UsersManager\API;
-use Piwik\Registry;
+
use Piwik\Session;
use Piwik\Tracker;
use Piwik\View;
diff --git a/core/Plugin.php b/core/Plugin.php
index 8febecde999102a91ad58658323e2dfd740fac91..63a293c3c0e4331a90148247365d4ed8a6a4e0ca 100644
--- a/core/Plugin.php
+++ b/core/Plugin.php
@@ -9,7 +9,7 @@
* @package Piwik
*/
namespace Piwik;
-use Piwik\Common;
+
use Piwik\Plugin\MetadataLoader;
/**
diff --git a/core/PluginsArchiver.php b/core/PluginsArchiver.php
index e54201c4ef18eec349d957b811646eb0d4ae7a47..93749321db250d4b63aaea86ad45965188df51d3 100644
--- a/core/PluginsArchiver.php
+++ b/core/PluginsArchiver.php
@@ -10,10 +10,8 @@
*/
namespace Piwik;
-use Piwik\Config;
-use Piwik\Common;
+
use Piwik\ArchiveProcessor;
-use Piwik\DataAccess\LogAggregator;
/**
* Plugins that archive metrics for websites can implement an Archiver that extends this class
diff --git a/core/PluginsManager.php b/core/PluginsManager.php
index 78982741b2950326684a81eadb81fa73b8d9991e..6d7e189b0a6eb25810a2095dd38a15a2a8156b17 100644
--- a/core/PluginsManager.php
+++ b/core/PluginsManager.php
@@ -13,7 +13,6 @@ namespace Piwik;
use Piwik\Plugin\MetadataLoader;
use Piwik\Translate;
-use Piwik\Option;
require_once PIWIK_INCLUDE_PATH . '/core/EventDispatcher.php';
diff --git a/core/Profiler.php b/core/Profiler.php
index 4ad407f3ee61ba1b54f90882d41d01eff7d72c47..c29117f49fe27b117b5d9641d5cc0df94455c23d 100644
--- a/core/Profiler.php
+++ b/core/Profiler.php
@@ -10,7 +10,7 @@
*/
namespace Piwik;
-use Piwik\Log;
+
/**
* Class Profiler helps with measuring memory, and profiling the database.
diff --git a/core/ProxyHeaders.php b/core/ProxyHeaders.php
index 07d9c9f8836897297744dac8c99ee74cc6de5010..7411d3489793886c9f90190f39bfda3a2f8e0e29 100644
--- a/core/ProxyHeaders.php
+++ b/core/ProxyHeaders.php
@@ -10,7 +10,7 @@
*/
namespace Piwik;
-use Piwik\Common;
+
/**
* Proxy headers
diff --git a/core/QuickForm2.php b/core/QuickForm2.php
index 3de11b9c3a20965abf94eb79b2f61c201e6efb71..19d5edcaef995fd6b0aac8069c77f60219fb5727 100644
--- a/core/QuickForm2.php
+++ b/core/QuickForm2.php
@@ -16,7 +16,6 @@ use HTML_QuickForm2_InvalidArgumentException;
use HTML_QuickForm2_Node;
use HTML_QuickForm2_NotFoundException;
use HTML_QuickForm2_Renderer;
-use Piwik\Url;
/**
* Manages forms displayed in Twig
diff --git a/core/Session.php b/core/Session.php
index a19a546dabab5e40b3d418e17d4b13a8a0b07a39..df511d14641fbb555107b87fffc85e4d3cd23fb3 100644
--- a/core/Session.php
+++ b/core/Session.php
@@ -11,7 +11,7 @@
namespace Piwik;
use Exception;
-use Piwik\Log;
+
use Piwik\Session\SaveHandler\DbTable;
use Zend_Session;
diff --git a/core/Site.php b/core/Site.php
index 495975c1f6ba536e71feb6d8f5027375405ed89d..a97fc31621d0fda9408e1b48e7a41172fc3da322 100644
--- a/core/Site.php
+++ b/core/Site.php
@@ -11,7 +11,7 @@
namespace Piwik;
use Exception;
-use Piwik\Date;
+
use Piwik\Plugins\SitesManager\API;
/**
diff --git a/core/TaskScheduler.php b/core/TaskScheduler.php
index 8bc1a7b3c73fcb4095b79572cf633a1e8db892d2..1d7880be35069e32fc7057684d61560a0cab1c0c 100644
--- a/core/TaskScheduler.php
+++ b/core/TaskScheduler.php
@@ -13,8 +13,6 @@
namespace Piwik;
use Exception;
-use Piwik\ScheduledTask;
-use Piwik\Timer;
define('DEBUG_FORCE_SCHEDULED_TASKS', false);
diff --git a/core/Tracker/Db/Mysqli.php b/core/Tracker/Db/Mysqli.php
index 0fe9e4e7a132572b29b66e2ab7a441e64033f9ad..77805b47b90a9178a61299e9b8f8cbd365852651 100644
--- a/core/Tracker/Db/Mysqli.php
+++ b/core/Tracker/Db/Mysqli.php
@@ -12,7 +12,6 @@ namespace Piwik\Tracker\Db;
use Exception;
use Piwik\Tracker\Db;
-use Piwik\Tracker\Db\DbException;
/**
* mysqli wrapper
diff --git a/core/Tracker/Db/Pdo/Pgsql.php b/core/Tracker/Db/Pdo/Pgsql.php
index ef43742d4c1610722acabe70b9d7626eb7db00c9..03abcabd2284c11ec2b14bb4c2fb657357ca6efa 100644
--- a/core/Tracker/Db/Pdo/Pgsql.php
+++ b/core/Tracker/Db/Pdo/Pgsql.php
@@ -13,7 +13,6 @@ namespace Piwik\Tracker\Db\Pdo;
use Exception;
use PDO;
-use Piwik\Tracker\Db\Pdo\Mysql;
/**
* PDO PostgreSQL wrapper
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
index 25fb11a6cb5349218b57628115e0b424299b3239..f77a7d7c923c6415c186a3b9d0627b1451f3c1a8 100644
--- a/core/Tracker/GoalManager.php
+++ b/core/Tracker/GoalManager.php
@@ -14,10 +14,6 @@ use Exception;
use Piwik\Config;
use Piwik\Common;
use Piwik\Tracker;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Cache;
-use Piwik\Tracker\Referrer;
-use Piwik\Tracker\Request;
/**
* @package Piwik
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
index 9365b706bdf9b3b2e497a41305e6176bf59198fa..8f16bb16500e65b993cc95fbb4061dbf697e0f68 100644
--- a/core/Tracker/Request.php
+++ b/core/Tracker/Request.php
@@ -7,7 +7,6 @@ use Piwik\Common;
use Piwik\Cookie;
use Piwik\IP;
use Piwik\Tracker;
-use Piwik\Tracker\Cache;
/**
* Piwik - Open source web analytics
diff --git a/core/Tracker/Visit.php b/core/Tracker/Visit.php
index 7df96eb24a5f5acec4a43b67646ee06dc8a67157..cce699bb62a64795ce3ce59b0d6e05d72a8c0fd8 100644
--- a/core/Tracker/Visit.php
+++ b/core/Tracker/Visit.php
@@ -15,13 +15,9 @@ use Piwik\Config;
use Piwik\Common;
use Piwik\IP;
use Piwik\Tracker;
-use Piwik\Tracker\Action;
-use Piwik\Tracker\Cache;
-use Piwik\Tracker\GoalManager;
-use Piwik\Tracker\Request;
-use Piwik\Tracker\Referrer;
+
use Exception;
-use Piwik\Tracker\VisitExcluded;
+
use UserAgentParser;
/**
diff --git a/core/Tracker/VisitExcluded.php b/core/Tracker/VisitExcluded.php
index a9a74635f5e5f03a7bff7126adf5073c74788ad3..bba1d5c483be4a644d69f30943a1d2276d3b1240 100644
--- a/core/Tracker/VisitExcluded.php
+++ b/core/Tracker/VisitExcluded.php
@@ -12,9 +12,6 @@ namespace Piwik\Tracker;
use Piwik\Common;
use Piwik\IP;
-use Piwik\Tracker\Cache;
-use Piwik\Tracker\IgnoreCookie;
-use Piwik\Tracker\Request;
/**
* This class contains the logic to exclude some visitors from being tracked as per user settings
diff --git a/core/Translate/Filter/ByBaseTranslations.php b/core/Translate/Filter/ByBaseTranslations.php
index 918274dad8bdfbf08e8d59da4049c4e7304b41a0..a62879af112288b49f3322d83ad18def74eeceb7 100644
--- a/core/Translate/Filter/ByBaseTranslations.php
+++ b/core/Translate/Filter/ByBaseTranslations.php
@@ -11,7 +11,7 @@
namespace Piwik\Translate\Filter;
-use Piwik\Translate\Filter\FilterAbstract;
+
/**
* @package Piwik
diff --git a/core/Translate/Filter/ByParameterCount.php b/core/Translate/Filter/ByParameterCount.php
index 174d51ccafc094793600bc5bc3ddbe9bddc364eb..cfcfc7f6afa1216f9eab40ec7e81287796250a08 100644
--- a/core/Translate/Filter/ByParameterCount.php
+++ b/core/Translate/Filter/ByParameterCount.php
@@ -11,7 +11,7 @@
namespace Piwik\Translate\Filter;
-use Piwik\Translate\Filter\FilterAbstract;
+
/**
* @package Piwik
diff --git a/core/Translate/Filter/EmptyTranslations.php b/core/Translate/Filter/EmptyTranslations.php
index d5083a6fad2dd99738b8f8424a69d9c91a1ae2e1..d6b9786735df9495e9e828bf0e28f672c8e9d2bb 100644
--- a/core/Translate/Filter/EmptyTranslations.php
+++ b/core/Translate/Filter/EmptyTranslations.php
@@ -11,7 +11,7 @@
namespace Piwik\Translate\Filter;
-use Piwik\Translate\Filter\FilterAbstract;
+
/**
* @package Piwik
diff --git a/core/Translate/Filter/EncodedEntities.php b/core/Translate/Filter/EncodedEntities.php
index c5a8dcf0aa840d40ff144633a0388c8f6f18f129..25c6853671e12fb0e14abd43355ff498a2580a08 100644
--- a/core/Translate/Filter/EncodedEntities.php
+++ b/core/Translate/Filter/EncodedEntities.php
@@ -11,7 +11,7 @@
namespace Piwik\Translate\Filter;
-use Piwik\Translate\Filter\FilterAbstract;
+
use Piwik\Translate;
/**
diff --git a/core/Translate/Filter/UnnecassaryWhitespaces.php b/core/Translate/Filter/UnnecassaryWhitespaces.php
index 6dae9b267db9a654b7200910a66d1b9163b8eeea..900bac5327009efde34149c0202c09967241bcfe 100644
--- a/core/Translate/Filter/UnnecassaryWhitespaces.php
+++ b/core/Translate/Filter/UnnecassaryWhitespaces.php
@@ -11,7 +11,7 @@
namespace Piwik\Translate\Filter;
-use Piwik\Translate\Filter\FilterAbstract;
+
/**
* @package Piwik
diff --git a/core/Translate/Validate/CoreTranslations.php b/core/Translate/Validate/CoreTranslations.php
index 46648dedbed69ce0bde2b18ba88946ac704dc046..5a7c0ebc111d12b12688515a03eb0a3cdc7cf706 100644
--- a/core/Translate/Validate/CoreTranslations.php
+++ b/core/Translate/Validate/CoreTranslations.php
@@ -11,7 +11,7 @@
namespace Piwik\Translate\Validate;
-use Piwik\Translate\Validate\ValidateAbstract;
+
use Piwik\Common;
/**
diff --git a/core/Translate/Validate/NoScripts.php b/core/Translate/Validate/NoScripts.php
index 9e8fc59592067babc21a2e5ce3502c6178ba924c..c7751e81e426e4c76aaced1273d647cbdbdb0485 100644
--- a/core/Translate/Validate/NoScripts.php
+++ b/core/Translate/Validate/NoScripts.php
@@ -11,9 +11,6 @@
namespace Piwik\Translate\Validate;
-use Piwik\Translate\Validate\ValidateAbstract;
-use Piwik\Common;
-
/**
* @package Piwik
* @subpackage Piwik_Translate
diff --git a/core/Unzip.php b/core/Unzip.php
index 705eee93a10c98eb08cbf1ddf8a15045f1adf906..4eb7d93e295d8186754a36c065710dc13d7ccb58 100644
--- a/core/Unzip.php
+++ b/core/Unzip.php
@@ -12,7 +12,7 @@
namespace Piwik;
use Piwik\Unzip\Gzip;
-use Piwik\Unzip\UncompressInterface;
+
use Piwik\Unzip\PclZip;
use Piwik\Unzip\Tar;
use Piwik\Unzip\ZipArchive;
diff --git a/core/Unzip/Gzip.php b/core/Unzip/Gzip.php
index 0e0e80d01b0ce3a2a4e3306e1fb791b5cec09f8b..1aa45fa633ad0a4e0dccc7d6c462258d95787158 100755
--- a/core/Unzip/Gzip.php
+++ b/core/Unzip/Gzip.php
@@ -11,7 +11,7 @@
namespace Piwik\Unzip;
-use Piwik\Unzip\UncompressInterface;
+
/**
* Unzip implementation for .gz files.
diff --git a/core/Unzip/PclZip.php b/core/Unzip/PclZip.php
index 5ad6191681d4fe579a8c2303415f200f20b73b5b..2d4771c617f845da95ffb6f5f95164855e5782e4 100644
--- a/core/Unzip/PclZip.php
+++ b/core/Unzip/PclZip.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Unzip;
-use Piwik\Unzip\UncompressInterface;
+
/**
* @see libs/PclZip
diff --git a/core/Unzip/Tar.php b/core/Unzip/Tar.php
index 3e1bac63648d18a8ecb8fd33bd4c98eae59a33b7..ba0609dd26eb087c86bcf2d2ba24ba8963a359af 100755
--- a/core/Unzip/Tar.php
+++ b/core/Unzip/Tar.php
@@ -11,7 +11,6 @@
namespace Piwik\Unzip;
use Archive_Tar;
-use Piwik\Unzip\UncompressInterface;
/**
* @see libs/Archive_Tar
diff --git a/core/Unzip/ZipArchive.php b/core/Unzip/ZipArchive.php
index 1e95872cb73180bf8642430f6877b3f56dd5cc3b..7a058ae90235feba0b4005395f56ec063fa6b714 100644
--- a/core/Unzip/ZipArchive.php
+++ b/core/Unzip/ZipArchive.php
@@ -11,7 +11,6 @@
namespace Piwik\Unzip;
use Exception;
-use Piwik\Unzip\UncompressInterface;
/**
* Unzip wrapper around ZipArchive
diff --git a/core/UpdateCheck.php b/core/UpdateCheck.php
index 770a69eff35c69b7d757e21a87cccccc4d597857..f381ec6c65ef951d78b45f40746b7de8a7ce5cb6 100644
--- a/core/UpdateCheck.php
+++ b/core/UpdateCheck.php
@@ -11,12 +11,8 @@
namespace Piwik;
use Exception;
-use Piwik\Config;
-use Piwik\Common;
-use Piwik\Http;
+
use Piwik\Plugins\SitesManager\API;
-use Piwik\Url;
-use Piwik\Version;
/**
* Class to check if a newer version of Piwik is available
diff --git a/core/Updater.php b/core/Updater.php
index 6d431910b8b4cdb3281869094ddfff46126c8359..3566ecc5c030cf2dbafecdaba4065b658c61473f 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -10,9 +10,6 @@
*/
namespace Piwik;
-use Piwik\Common;
-use Piwik\Version;
-
/**
* Load and execute all relevant, incremental update scripts for Piwik core and plugins, and bump the component version numbers for completed updates.
*
diff --git a/core/Updates.php b/core/Updates.php
index e54ff50569e1303e4eede49ca1b2534a3e3f5528..afecf07680c0469587747b685f53fa826e639235 100644
--- a/core/Updates.php
+++ b/core/Updates.php
@@ -10,7 +10,7 @@
*/
namespace Piwik;
-use Piwik\Config;
+
/**
* Abstract class for update scripts
diff --git a/core/View.php b/core/View.php
index f07ae88cb09dc5aacbe10548fefa68df8b0aa00a..c0b6c9bcc2c0562b2c830f236b2a5591d7684b82 100644
--- a/core/View.php
+++ b/core/View.php
@@ -11,7 +11,7 @@
namespace Piwik;
use Exception;
-use Piwik\Registry;
+
use Piwik\Plugins\SitesManager\API as APISitesManager;
use Piwik\Plugins\UsersManager\API as APIUsersManager;
use Piwik\View\ViewInterface;
diff --git a/core/ViewDataTable/Graph.php b/core/ViewDataTable/Graph.php
index a12a6b63ba98976f8f161055cf617629c1281fbb..fceb66a197dc27eaba39e21067acf0016c1e0bc8 100644
--- a/core/ViewDataTable/Graph.php
+++ b/core/ViewDataTable/Graph.php
@@ -10,9 +10,8 @@
*/
namespace Piwik\ViewDataTable;
-use Piwik\Common;
+
use Piwik\DataTable\Row;
-use Piwik\ViewDataTable\Visualization;
/**
* This is an abstract visualization that should be the base of any 'graph' visualization.
diff --git a/core/ViewDataTable/Properties.php b/core/ViewDataTable/Properties.php
index 81eabc0234b36d55371690b595b2b4065b518475..9929b663ccf9b36712f0dcdf5104bd5e0bdc4b72 100644
--- a/core/ViewDataTable/Properties.php
+++ b/core/ViewDataTable/Properties.php
@@ -13,10 +13,9 @@ namespace Piwik\ViewDataTable;
use Exception;
use ReflectionClass;
-use Piwik\Piwik;
+
use Piwik\Config;
use Piwik\Metrics;
-use Piwik\Common;
/**
* Contains the list of all core DataTable display properties for use with ViewDataTable.
diff --git a/core/ViewDataTable/VisualizationPropertiesProxy.php b/core/ViewDataTable/VisualizationPropertiesProxy.php
index 8930cb96967a52d4326692a4010b5060882fa904..25c8abe865440d48e0d5746d68ebc2db085e0fe0 100644
--- a/core/ViewDataTable/VisualizationPropertiesProxy.php
+++ b/core/ViewDataTable/VisualizationPropertiesProxy.php
@@ -11,7 +11,7 @@
namespace Piwik\ViewDataTable;
-use Piwik\ViewDataTable\Properties;
+
/**
* Proxy object used to get/set visualization properties. Used to check that property
diff --git a/misc/others/test_generateLotsVisitsWebsites.php b/misc/others/test_generateLotsVisitsWebsites.php
index 77c84cdc4f158df80e658bb92972cd97d5926586..2c58ea2a49f29f7da981b3c3d8d059cf53f05857 100644
--- a/misc/others/test_generateLotsVisitsWebsites.php
+++ b/misc/others/test_generateLotsVisitsWebsites.php
@@ -2,7 +2,7 @@
use Piwik\Common;
use Piwik\Config;
use Piwik\FrontController;
-use Piwik\Piwik;
+
use Piwik\Log;
define('PIWIK_INCLUDE_PATH', realpath(dirname(__FILE__) . "/../.."));
diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php
index b01c98f87b23f3f845d96ba23db67013b5c91ee1..a88dc1c23067ddfbc7cd05cb12ecd2b0b94768b0 100644
--- a/plugins/Actions/API.php
+++ b/plugins/Actions/API.php
@@ -17,10 +17,9 @@ use Piwik\Piwik;
use Piwik\Common;
use Piwik\Date;
use Piwik\DataTable;
-use Piwik\Plugins\Actions\Actions;
+
use Piwik\Tracker\Action;
-use Piwik\Plugins\Actions\Archiver;
-use Piwik\Plugins\Actions\ArchivingHelper;
+
use Piwik\Plugins\CustomVariables\API as APICustomVariables;
/**
diff --git a/plugins/Actions/Archiver.php b/plugins/Actions/Archiver.php
index c177a73ffea0f2e956aef9707c44ee588e82d8bb..a45545574e3e8bb5657b7f2c1e26edde38a723fd 100644
--- a/plugins/Actions/Archiver.php
+++ b/plugins/Actions/Archiver.php
@@ -18,7 +18,6 @@ use Piwik\DataTable;
use Piwik\RankingQuery;
use Piwik\PluginsArchiver;
use Piwik\Tracker\Action;
-use Piwik\Plugins\Actions\ArchivingHelper;
/**
* Class encapsulating logic to process Day/Period Archiving for the Actions reports
diff --git a/plugins/Annotations/API.php b/plugins/Annotations/API.php
index 0e946b7302c46d5f941fc818105a94b83c5b6a13..21ea6f8a536a02be4adc5a63869f6abb75b67f9d 100755
--- a/plugins/Annotations/API.php
+++ b/plugins/Annotations/API.php
@@ -15,7 +15,7 @@ use Piwik\Period;
use Piwik\Period\Range;
use Piwik\Piwik;
use Piwik\Date;
-use Piwik\Plugins\Annotations\AnnotationList;
+
use Piwik\ViewDataTable;
use Piwik\Plugins\CoreVisualizations\Visualizations\JqplotGraph\Evolution as EvolutionViz;
diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
index 00a927fe6db76bfaf91bf337abfff687039e1ab1..968baef392da336f08f64b2623aed4d660a8de96 100755
--- a/plugins/Annotations/Controller.php
+++ b/plugins/Annotations/Controller.php
@@ -12,8 +12,7 @@ namespace Piwik\Plugins\Annotations;
use Piwik\API\Request;
use Piwik\Common;
-use Piwik\Plugins\Annotations\AnnotationList;
-use Piwik\Plugins\Annotations\API;
+
use Piwik\View;
/**
diff --git a/plugins/CoreConsole/GenerateApi.php b/plugins/CoreConsole/GenerateApi.php
index b075d1a56bccc5754a1ba50d45c87d97e93fd092..1760c6ca3e0d0da7bfb1f46fe0619626f9ad1e08 100644
--- a/plugins/CoreConsole/GenerateApi.php
+++ b/plugins/CoreConsole/GenerateApi.php
@@ -11,8 +11,6 @@
namespace Piwik\Plugins\CoreConsole;
-use Piwik\Common;
-use Piwik\Filesystem;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
diff --git a/plugins/CoreConsole/GenerateController.php b/plugins/CoreConsole/GenerateController.php
index e20a394d06abc956a12e6d4dd4ba879dc7958925..bedbbbd1749f7b4b653432d5a75efc05987adfa2 100644
--- a/plugins/CoreConsole/GenerateController.php
+++ b/plugins/CoreConsole/GenerateController.php
@@ -11,8 +11,6 @@
namespace Piwik\Plugins\CoreConsole;
-use Piwik\Common;
-use Piwik\Filesystem;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
diff --git a/plugins/CoreConsole/GeneratePlugin.php b/plugins/CoreConsole/GeneratePlugin.php
index f9cc574fab0fae6d7f275bdec74d95df7f552e6b..1dbe50a2fcda73b900796cab686c403662c5a8ce 100644
--- a/plugins/CoreConsole/GeneratePlugin.php
+++ b/plugins/CoreConsole/GeneratePlugin.php
@@ -11,7 +11,7 @@
namespace Piwik\Plugins\CoreConsole;
-use Piwik\Common;
+
use Piwik\Filesystem;
use Symfony\Component\Console\Input\ArrayInput;
use Symfony\Component\Console\Input\InputInterface;
diff --git a/plugins/CoreConsole/GeneratePluginBase.php b/plugins/CoreConsole/GeneratePluginBase.php
index 12d3a92955e8d5dcce28a30ddbd5c210f95acd43..220e24030c97313446f17bf7933d769138f2fc93 100644
--- a/plugins/CoreConsole/GeneratePluginBase.php
+++ b/plugins/CoreConsole/GeneratePluginBase.php
@@ -11,11 +11,9 @@
namespace Piwik\Plugins\CoreConsole;
-use Piwik\Common;
+
use Piwik\Console\Command;
use Piwik\Filesystem;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
/**
* @package CoreConsole
diff --git a/plugins/CoreConsole/WatchLog.php b/plugins/CoreConsole/WatchLog.php
index b43b4feda145e1a2bbf9cf5ea5728d07787ba13b..16adfc56db6142bd20be3e5edf8ba14b14baf752 100644
--- a/plugins/CoreConsole/WatchLog.php
+++ b/plugins/CoreConsole/WatchLog.php
@@ -12,10 +12,9 @@
namespace Piwik\Plugins\CoreConsole;
use Piwik\Console\Command;
-use Symfony\Component\Console\Input\InputArgument;
+
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputOption;
/**
* @package CoreConsole
diff --git a/plugins/CoreHome/Controller.php b/plugins/CoreHome/Controller.php
index 50533b1506d13a96c994bc5855c500cf88c7a325..024975bc29365e2d30f87829d672b9b10ed2ad5d 100644
--- a/plugins/CoreHome/Controller.php
+++ b/plugins/CoreHome/Controller.php
@@ -12,11 +12,11 @@ namespace Piwik\Plugins\CoreHome;
use Exception;
use Piwik\API\Request;
-use Piwik\CacheFile;
+
use Piwik\Piwik;
use Piwik\Common;
use Piwik\Date;
-use Piwik\AssetManager;
+
use Piwik\FrontController;
use Piwik\Plugins\CorePluginsAdmin\MarketplaceApiClient;
use Piwik\View;
diff --git a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
index 411dbef0d91d7174e42b0816398c77784ef5f837..5cb54b0fc450f7716747ae1c410cdfaafe596148 100644
--- a/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
+++ b/plugins/CoreHome/DataTableRowAction/MultiRowEvolution.php
@@ -12,7 +12,6 @@ namespace Piwik\Plugins\CoreHome\DataTableRowAction;
use Piwik\Common;
use Piwik\ViewDataTable;
-use Piwik\Plugins\CoreHome\DataTableRowAction\RowEvolution;
/**
* MULTI ROW EVOLUTION
diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php
index 680d0462af5302baba5ed3b5da41e519ca744c25..2bb20770b6a65c515c54f0d4522025226be90f2f 100644
--- a/plugins/CorePluginsAdmin/Controller.php
+++ b/plugins/CorePluginsAdmin/Controller.php
@@ -11,8 +11,7 @@
namespace Piwik\Plugins\CorePluginsAdmin;
use Piwik\Common;
-use Piwik\Config;
-use Piwik\Date;
+
use Piwik\Filechecks;
use Piwik\Filesystem;
use Piwik\Nonce;
diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php
index 03ff437a5dbf37b3dbb1626d209aaf63efee878b..f8529c74dacaf98a2475252a5e465ba4dfffea54 100644
--- a/plugins/CorePluginsAdmin/Marketplace.php
+++ b/plugins/CorePluginsAdmin/Marketplace.php
@@ -11,7 +11,7 @@
namespace Piwik\Plugins\CorePluginsAdmin;
use Piwik\Date;
-use Piwik\Piwik;
+
use Piwik\PluginsManager;
/**
diff --git a/plugins/CorePluginsAdmin/MarketplaceApiClient.php b/plugins/CorePluginsAdmin/MarketplaceApiClient.php
index 817015c2cce3dfab73e78ca0fbf7eb2428be2822..a5b6d7b53e5db9f3ec91d5a836ecef727d74c7e2 100644
--- a/plugins/CorePluginsAdmin/MarketplaceApiClient.php
+++ b/plugins/CorePluginsAdmin/MarketplaceApiClient.php
@@ -11,7 +11,7 @@
namespace Piwik\Plugins\CorePluginsAdmin;
use Piwik\CacheFile;
use Piwik\Http;
-use Piwik\Piwik;
+
use Piwik\PluginsManager;
use Piwik\Version;
diff --git a/plugins/CorePluginsAdmin/PluginInstaller.php b/plugins/CorePluginsAdmin/PluginInstaller.php
index 3fabe7cf553ef49009648be08e428bfd5d80d07b..4bc1ca8229f9173dd47177b58bdb93a009d1ebaa 100644
--- a/plugins/CorePluginsAdmin/PluginInstaller.php
+++ b/plugins/CorePluginsAdmin/PluginInstaller.php
@@ -11,7 +11,7 @@
namespace Piwik\Plugins\CorePluginsAdmin;
use Piwik\Filechecks;
use Piwik\Filesystem;
-use Piwik\Log;
+
use Piwik\SettingsPiwik;
use Piwik\Unzip;
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator.php b/plugins/CoreVisualizations/JqplotDataGenerator.php
index 029a17a5ebc50b9301c9122d6e1a224291e85893..602f3ca3834f0ed4451145fc9451a9c75a3fb1ab 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator.php
@@ -15,7 +15,7 @@ use Exception;
use Piwik\Common;
use Piwik\Metrics;
use Piwik\DataTable;
-use Piwik\ViewDataTable\Visualization;
+
use Piwik\Plugins\CoreVisualizations\JqplotDataGenerator\Chart;
require_once PIWIK_INCLUDE_PATH . '/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php';
diff --git a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php
index 6c033a9c40fdd5942d3b81db4618972b85f3778d..18e75f2cc1cfd5a6cead6515e041974f1c9956b7 100644
--- a/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php
+++ b/plugins/CoreVisualizations/JqplotDataGenerator/Evolution.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\CoreVisualizations\JqplotDataGenerator;
-use Piwik\Piwik;
+
use Piwik\Common;
use Piwik\DataTable;
use Piwik\DataTable\Row;
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php
index 6eae635bd1a77e70d2fa01ad5c7b33153e31c743..d7e1fc88089875699b594bae07e6ae574cbfc138 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\CoreVisualizations\Visualizations;
-use Piwik\Common;
+
use Piwik\View;
use Piwik\DataTable;
use Piwik\ViewDataTable\Graph;
diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php
index 7e42e6de4947a4905c7e62c4d3dd5ada90c9d204..4a147427e7bae5f4ca3c6d230ec5d0bde948c908 100644
--- a/plugins/CustomVariables/API.php
+++ b/plugins/CustomVariables/API.php
@@ -15,7 +15,6 @@ use Piwik\Metrics;
use Piwik\Date;
use Piwik\DataTable;
use Piwik\Tracker\Action;
-use Piwik\Plugins\CustomVariables\Archiver;
/**
* The Custom Variables API lets you access reports for your <a href='http://piwik.org/docs/custom-variables/' target='_blank'>Custom Variables</a> names and values.
diff --git a/plugins/CustomVariables/Archiver.php b/plugins/CustomVariables/Archiver.php
index d4d3cb7884b7f980ba4df16091dcde569dd609e2..2980a43310ea995a333b0f4f6030c432e953a360 100644
--- a/plugins/CustomVariables/Archiver.php
+++ b/plugins/CustomVariables/Archiver.php
@@ -15,7 +15,7 @@ use Piwik\Config;
use Piwik\DataAccess\LogAggregator;
use Piwik\Metrics;
use Piwik\DataArray;
-use Piwik\Plugins\CustomVariables\API;
+
use Piwik\Tracker;
use Piwik\PluginsArchiver;
use Piwik\Tracker\GoalManager;
diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php
index 7f8dd16edf153384dca8e80e7b30e6fc91d5a392..06f26a2aa28c011fa5a45aa9182e48cc35728667 100644
--- a/plugins/CustomVariables/CustomVariables.php
+++ b/plugins/CustomVariables/CustomVariables.php
@@ -11,7 +11,7 @@
namespace Piwik\Plugins\CustomVariables;
use Piwik\ArchiveProcessor;
-use Piwik\Plugins\CustomVariables\Archiver;
+
use Piwik\Tracker;
use Piwik\WidgetsList;
diff --git a/plugins/DBStats/API.php b/plugins/DBStats/API.php
index 11788d19a112ec321596e7fcc4add5f9a424484b..2f63fcea9a181cf1cb706bb9f1fa07955d9cd0a0 100644
--- a/plugins/DBStats/API.php
+++ b/plugins/DBStats/API.php
@@ -13,7 +13,6 @@ namespace Piwik\Plugins\DBStats;
use Piwik\Piwik;
use Piwik\Common;
use Piwik\DataTable;
-use Piwik\Plugins\DBStats\MySQLMetadataProvider;
/**
* @see plugins/DBStats/MySQLMetadataProvider.php
diff --git a/plugins/DBStats/DBStats.php b/plugins/DBStats/DBStats.php
index 6e5f322191c8b3ab35b8f11bcc86034d21738481..047d599eeaf0838ee9ba9e1a5cb5855a38fd01da 100644
--- a/plugins/DBStats/DBStats.php
+++ b/plugins/DBStats/DBStats.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\DBStats;
use Piwik\Piwik;
use Piwik\Date;
use Piwik\Common;
-use Piwik\Plugins\DBStats\API;
+
use Piwik\ScheduledTask;
use Piwik\ScheduledTime\Weekly;
diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
index bded95b33e5e5cd22e46d56c2b12af38cd874c48..c919230db74a7bbc620c55b2ab1f132914eaffd6 100644
--- a/plugins/Dashboard/Controller.php
+++ b/plugins/Dashboard/Controller.php
@@ -12,7 +12,7 @@ namespace Piwik\Plugins\Dashboard;
use Piwik\DataTable\Renderer\Json;
use Piwik\Piwik;
use Piwik\Common;
-use Piwik\Plugins\Dashboard\Dashboard;
+
use Piwik\Session\SessionNamespace;
use Piwik\View;
use Piwik\Db;
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 56cc537ffea4aa36afde9801f5de97775b44356e..ae9ba66caeb9b590cef4a38a77c22a4c2bd5b9d8 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -15,7 +15,7 @@ use Exception;
use Piwik\ArchiveProcessor;
use Piwik\Config;
use Piwik\Common;
-use Piwik\Plugins\DevicesDetection\Archiver;
+
use Piwik\WidgetsList;
use Piwik\Db;
use UserAgentParserEnhanced;
diff --git a/plugins/ExamplePlugin/Controller.php b/plugins/ExamplePlugin/Controller.php
index 05ee0a6928501ffaf4aac5e37caa307934e13338..6a2001453c14f7fc1ee2b446982f598df3ec7f88 100644
--- a/plugins/ExamplePlugin/Controller.php
+++ b/plugins/ExamplePlugin/Controller.php
@@ -14,7 +14,7 @@ use Piwik\Piwik;
use Piwik\Common;
use Piwik\View;
use Piwik\Db;
-use Piwik\WidgetsList;
+
use Piwik\Plugins\SitesManager\API;
/**
diff --git a/plugins/ExampleRssWidget/Controller.php b/plugins/ExampleRssWidget/Controller.php
index a8a5eb724703986f9145a7ceed34d5b1938c7fdd..68320fc9eb93aac88769c924a6f37e027a5b8466 100644
--- a/plugins/ExampleRssWidget/Controller.php
+++ b/plugins/ExampleRssWidget/Controller.php
@@ -12,7 +12,6 @@
namespace Piwik\Plugins\ExampleRssWidget;
use Exception;
-use Piwik\Plugins\ExampleRssWidget\RssRenderer;
/**
*
diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php
index 6f7c769d5f02ac90a6ae6b612f31b2c9146030a6..65fb1c7d822b522e90a4c5fe7bab59b83bc0fdd4 100644
--- a/plugins/ExampleUI/Controller.php
+++ b/plugins/ExampleUI/Controller.php
@@ -12,7 +12,7 @@ namespace Piwik\Plugins\ExampleUI;
use Piwik\Common;
use Piwik\Piwik;
-use Piwik\Site;
+
use Piwik\ViewDataTable;
use Piwik\View;
diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 1fbdc79bff9d218913a02821c1902ac16a6cffec..66db3c2cbdea15f56c5e9883b48a1a073d8cda24 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -20,8 +20,6 @@ use Piwik\Site;
use Piwik\Db;
use Piwik\Tracker\Cache;
use Piwik\Tracker\GoalManager;
-use Piwik\Plugins\Goals\Goals;
-use Piwik\Plugins\Goals\Archiver;
/**
* Goals API lets you Manage existing goals, via "updateGoal" and "deleteGoal", create new Goals via "addGoal",
diff --git a/plugins/Goals/Archiver.php b/plugins/Goals/Archiver.php
index 419ab876e1d5cc100197e696d98578333cf1dc52..35be905257d0f5ac0cac930a7a488af33f5f45d3 100644
--- a/plugins/Goals/Archiver.php
+++ b/plugins/Goals/Archiver.php
@@ -18,7 +18,6 @@ use Piwik\DataArray;
use Piwik\PluginsArchiver;
use Piwik\PluginsManager;
use Piwik\Tracker\GoalManager;
-use Piwik\Plugins\Goals\Goals;
class Archiver extends PluginsArchiver
{
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 239ccf2b364f9f6f061a9887b812b7ad2a57b55e..297dd3d29c3c220a4b8221fef2fdfc3d9df132a3 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -20,7 +20,7 @@ use Piwik\FrontController;
use Piwik\View\ReportsByDimension;
use Piwik\ViewDataTable;
use Piwik\View;
-use Piwik\Plugins\Goals\Goals;
+
use Piwik\Plugins\Referrers\API as APIReferrers;
/**
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index 18e89766c76a8e82e98f95bbdeb4dbebdd54e322..775dad2b5be32d8c21af7edd9256ed91106389b1 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -13,8 +13,7 @@ namespace Piwik\Plugins\Goals;
use Piwik\ArchiveProcessor;
use Piwik\Piwik;
use Piwik\Common;
-use Piwik\Plugins\Goals\API;
-use Piwik\Plugins\Goals\Archiver;
+
use Piwik\Tracker\GoalManager;
use Piwik\Translate;
use Piwik\Site;
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
index f3be3b18be4806a70d51197ca24ef89585593a83..d0f7041401788c9d3999e27d3aa5f2c3a1b0554f 100644
--- a/plugins/ImageGraph/StaticGraph.php
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\ImageGraph;
use Exception;
use Piwik\Loader;
-use Piwik\Plugins\ImageGraph\API;
+
use pData;
use pImage;
use Piwik\SettingsPiwik;
diff --git a/plugins/ImageGraph/StaticGraph/Evolution.php b/plugins/ImageGraph/StaticGraph/Evolution.php
index 3bc870b9b63aa0adb34f0d131dacc0cba3733496..39eb88cabd1787065427da5c6c419b7801c7a1bd 100644
--- a/plugins/ImageGraph/StaticGraph/Evolution.php
+++ b/plugins/ImageGraph/StaticGraph/Evolution.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\ImageGraph\StaticGraph;
-use Piwik\Plugins\ImageGraph\StaticGraph\GridGraph;
+
/**
*
diff --git a/plugins/ImageGraph/StaticGraph/HorizontalBar.php b/plugins/ImageGraph/StaticGraph/HorizontalBar.php
index 64ebf2d4e556c3324441297e9448d0187b01c219..49fc5c642bff113b5da31fc1c8e20e825264ce95 100644
--- a/plugins/ImageGraph/StaticGraph/HorizontalBar.php
+++ b/plugins/ImageGraph/StaticGraph/HorizontalBar.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\ImageGraph\StaticGraph;
-use Piwik\Plugins\ImageGraph\StaticGraph\GridGraph;
+
/**
*
diff --git a/plugins/ImageGraph/StaticGraph/Pie.php b/plugins/ImageGraph/StaticGraph/Pie.php
index 1626ebd3fc7ee99339a116992ba68ed6bdeae765..200b273293073d3279eb74617500c95e5d449456 100644
--- a/plugins/ImageGraph/StaticGraph/Pie.php
+++ b/plugins/ImageGraph/StaticGraph/Pie.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\ImageGraph\StaticGraph;
-use Piwik\Plugins\ImageGraph\StaticGraph\PieGraph;
+
/**
*
diff --git a/plugins/ImageGraph/StaticGraph/VerticalBar.php b/plugins/ImageGraph/StaticGraph/VerticalBar.php
index add00e642343d60cf53a559f2cf7eb4df40752d2..273ade455bad1759afed7d61396338f42a1f6f0e 100644
--- a/plugins/ImageGraph/StaticGraph/VerticalBar.php
+++ b/plugins/ImageGraph/StaticGraph/VerticalBar.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\ImageGraph\StaticGraph;
-use Piwik\Plugins\ImageGraph\StaticGraph\GridGraph;
+
/**
*
diff --git a/plugins/Installation/Controller.php b/plugins/Installation/Controller.php
index a7977a53492a1002e1c920992d7bfcfab803b19f..9911ae5eef37e3a05f4f0fa4f86d16674721773e 100644
--- a/plugins/Installation/Controller.php
+++ b/plugins/Installation/Controller.php
@@ -23,7 +23,7 @@ use Piwik\DbHelper;
use Piwik\Filechecks;
use Piwik\Filesystem;
use Piwik\Http;
-use Piwik\Log;
+
use Piwik\Piwik;
use Piwik\Plugins\LanguagesManager\LanguagesManager;
use Piwik\Plugins\SitesManager\API as APISitesManager;
diff --git a/plugins/LanguagesManager/LanguagesManager.php b/plugins/LanguagesManager/LanguagesManager.php
index ae7f2e8129926e4e2fffd71615297a94d13fc2a1..e286ef8e985f88b794e1fbb8a4d14fd7c5a1ba21 100644
--- a/plugins/LanguagesManager/LanguagesManager.php
+++ b/plugins/LanguagesManager/LanguagesManager.php
@@ -16,7 +16,7 @@ use Piwik\Config;
use Piwik\Piwik;
use Piwik\Common;
use Piwik\Cookie;
-use Piwik\Plugins\LanguagesManager\API;
+
use Piwik\View;
use Piwik\Db;
use Piwik\Translate;
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index ab2b137603eee636a27c0770b481f541e724d970..47c9799076467227f2007e145a8a9432d2df9f9f 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\Live;
-use Piwik\Piwik;
+
use Piwik\Common;
use Piwik\WidgetsList;
diff --git a/plugins/MobileMessaging/API.php b/plugins/MobileMessaging/API.php
index 5b688521a4114ffa9c1e9bcf6278f77c17b2b65f..ce862e1f410d225deab26359a66b11e7a2fb5884 100644
--- a/plugins/MobileMessaging/API.php
+++ b/plugins/MobileMessaging/API.php
@@ -12,7 +12,7 @@ namespace Piwik\Plugins\MobileMessaging;
use Piwik\Piwik;
use Piwik\Common;
-use Piwik\Plugins\MobileMessaging\MobileMessaging;
+
use Piwik\Plugins\MobileMessaging\SMSProvider;
use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
diff --git a/plugins/MobileMessaging/Controller.php b/plugins/MobileMessaging/Controller.php
index 537a0fa3bc9bf370f01b8f7816ed3e599b102212..32c0e1ac215e739fbeb74da2d85dba874fcee68a 100644
--- a/plugins/MobileMessaging/Controller.php
+++ b/plugins/MobileMessaging/Controller.php
@@ -15,9 +15,9 @@ use Piwik\Piwik;
use Piwik\Common;
use Piwik\IP;
use Piwik\Plugins\LanguagesManager\LanguagesManager;
-use Piwik\Plugins\MobileMessaging\API;
+
use Piwik\View;
-use Piwik\Plugins\MobileMessaging\CountryCallingCodes;
+
use Piwik\Plugins\MobileMessaging\SMSProvider;
require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php';
diff --git a/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php b/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php
index 338dce98f6a45a877fefd3806ee4cf27a645d37a..f68d8cfeac5bd97270c1a5a710d6f28f35ace28a 100644
--- a/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php
+++ b/plugins/MobileMessaging/ReportRenderer/ReportRendererException.php
@@ -11,7 +11,6 @@
namespace Piwik\Plugins\MobileMessaging\ReportRenderer;
use Piwik\ReportRenderer;
-use Piwik\Plugins\MobileMessaging\ReportRenderer\Sms;
/**
*
diff --git a/plugins/MobileMessaging/SMSProvider.php b/plugins/MobileMessaging/SMSProvider.php
index 0d3ea6e9b0058ca7d3d711f01dbc3e7bf5a8675b..e7aa7ced8599cde95ce879ae61b8229d5c3826f7 100644
--- a/plugins/MobileMessaging/SMSProvider.php
+++ b/plugins/MobileMessaging/SMSProvider.php
@@ -12,7 +12,6 @@ namespace Piwik\Plugins\MobileMessaging;
use Exception;
use Piwik\Loader;
-use Piwik\Plugins\MobileMessaging\GSMCharset;
/**
* The SMSProvider abstract class is used as a base class for SMS provider implementations.
diff --git a/plugins/MultiSites/MultiSites.php b/plugins/MultiSites/MultiSites.php
index 0e08ac8cc8bce31919efedd4a565226eba944dc2..760b10ae50c1bb558e38cca930ea37cd8d21fda7 100644
--- a/plugins/MultiSites/MultiSites.php
+++ b/plugins/MultiSites/MultiSites.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\MultiSites;
-use Piwik\Plugins\MultiSites\API;
+
/**
*
diff --git a/plugins/PrivacyManager/LogDataPurger.php b/plugins/PrivacyManager/LogDataPurger.php
index 9a60af57814a767da55d7780b3e39bf2b316b8de..7fefd0c260f47d2e63419f3fa626e564299b7a04 100755
--- a/plugins/PrivacyManager/LogDataPurger.php
+++ b/plugins/PrivacyManager/LogDataPurger.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\PrivacyManager;
use Piwik\Common;
use Piwik\Date;
use Piwik\Db;
-use Piwik\Piwik;
+
use Piwik\Log;
/**
diff --git a/plugins/PrivacyManager/PrivacyManager.php b/plugins/PrivacyManager/PrivacyManager.php
index 5831ccd0f0f130026a1778141a185ab22b9d0136..9d397d6f33e6ccd024f840f4bf3adbe0eb5f3fce 100644
--- a/plugins/PrivacyManager/PrivacyManager.php
+++ b/plugins/PrivacyManager/PrivacyManager.php
@@ -17,12 +17,11 @@ use Piwik\Piwik;
use Piwik\Common;
use Piwik\Date;
use Piwik\Plugins\Goals\Archiver;
-use Piwik\Plugins\PrivacyManager\LogDataPurger;
+
use Piwik\ScheduledTask;
use Piwik\Db;
use Piwik\ScheduledTime\Daily;
use Piwik\Tracker\GoalManager;
-use Piwik\Plugins\PrivacyManager\ReportsPurger;
/**
* @see plugins/PrivacyManager/LogDataPurger.php
diff --git a/plugins/Provider/API.php b/plugins/Provider/API.php
index 88eb4b473be5dfb4570a1ba05c9e2ba72df25096..106fbd5883f551774ae088a4ae8414d6fe8ac5ee 100644
--- a/plugins/Provider/API.php
+++ b/plugins/Provider/API.php
@@ -13,7 +13,6 @@ namespace Piwik\Plugins\Provider;
use Piwik\Archive;
use Piwik\Metrics;
use Piwik\Piwik;
-use Piwik\Plugins\Provider\Archiver;
/**
* @see plugins/Provider/functions.php
diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php
index 77ce6ea7a14284f8f681daeadea40c77befa3e5f..18c11f1e48c52a56735dcf9b7667da6c61f02f04 100644
--- a/plugins/Provider/Provider.php
+++ b/plugins/Provider/Provider.php
@@ -16,7 +16,7 @@ use Piwik\FrontController;
use Piwik\IP;
use Piwik\ArchiveProcessor;
use Piwik\Db;
-use Piwik\Plugins\Provider\Archiver;
+
use Piwik\WidgetsList;
/**
diff --git a/plugins/SEO/API.php b/plugins/SEO/API.php
index 307e20fc78ed12e0afadc9cedcc12f83bae970ca..e1c380dda11c0acf4d92db97cadb243465eb60d0 100644
--- a/plugins/SEO/API.php
+++ b/plugins/SEO/API.php
@@ -12,8 +12,6 @@ namespace Piwik\Plugins\SEO;
use Piwik\Piwik;
use Piwik\DataTable;
-use Piwik\Plugins\SEO\MajesticClient;
-use Piwik\Plugins\SEO\RankChecker;
/**
* @see plugins/Referrers/functions.php
diff --git a/plugins/SEO/RankChecker.php b/plugins/SEO/RankChecker.php
index 373a2eabea0cffa1bd4472883649bd4451b62961..70caeb6dc57d96b053729aa017fedf7eee39041a 100644
--- a/plugins/SEO/RankChecker.php
+++ b/plugins/SEO/RankChecker.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\SEO;
use Exception;
use Piwik\Http;
use Piwik\MetricsFormatter;
-use Piwik\Piwik;
+
use Piwik\Log;
/**
diff --git a/plugins/ScheduledReports/Controller.php b/plugins/ScheduledReports/Controller.php
index 1e1180301fd02a013d30e54f67e4667aa56d9282..3d3cd019e166728d35aa78244a133f4fcff0a6ca 100644
--- a/plugins/ScheduledReports/Controller.php
+++ b/plugins/ScheduledReports/Controller.php
@@ -13,9 +13,9 @@ namespace Piwik\Plugins\ScheduledReports;
use Piwik\Piwik;
use Piwik\Common;
use Piwik\Plugins\LanguagesManager\LanguagesManager;
-use Piwik\Plugins\ScheduledReports\API;
+
use Piwik\View;
-use Piwik\Plugins\ScheduledReports\ScheduledReports;
+
use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
use Piwik\Plugins\SitesManager\API as APISitesManager;
diff --git a/plugins/SegmentEditor/Controller.php b/plugins/SegmentEditor/Controller.php
index f743692b4a00719a2e06f333ae0e8b5eb2b27b8d..8cee3bc124e3ff9313a238bd7a4ab10fddcb2353 100644
--- a/plugins/SegmentEditor/Controller.php
+++ b/plugins/SegmentEditor/Controller.php
@@ -12,7 +12,7 @@ namespace Piwik\Plugins\SegmentEditor;
use Piwik\Piwik;
use Piwik\Common;
-use Piwik\Plugins\SegmentEditor\API;
+
use Piwik\View;
use Piwik\Plugins\API\API as APIMetadata;
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index 5c77fd02dad33fb837fdc8b4d8da17fc571d0667..f0cea48e26b67f0a91b07801aa81948bdf27f1ba 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -12,8 +12,7 @@ namespace Piwik\Plugins\SegmentEditor;
use Exception;
use Piwik\Common;
-use Piwik\Plugins\SegmentEditor\API;
-use Piwik\Plugins\SegmentEditor\Controller;
+
use Piwik\Version;
use Piwik\Db;
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 69b49463504681154b8bfddef324724159ecfb49..a3311bf1007be3e69668fbdf9b0f1d3030201dda 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -30,7 +30,6 @@ use Piwik\Segment;
use Piwik\SegmentExpression;
use Piwik\Site;
use Piwik\Tracker\Action;
-use Piwik\Plugins\Transitions\Controller;
/**
* @package Transitions
diff --git a/plugins/UserCountry/API.php b/plugins/UserCountry/API.php
index b62076385c55ef6566081cded1af83bb2b0e8775..c74d6eb915d3a5feb3b7069f204df561f3e25015 100644
--- a/plugins/UserCountry/API.php
+++ b/plugins/UserCountry/API.php
@@ -16,7 +16,7 @@ use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\DataTable;
use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\Archiver;
+
use Piwik\Tracker\Visit;
/**
diff --git a/plugins/UserCountry/Controller.php b/plugins/UserCountry/Controller.php
index c79f348512e498cdc2d6182a7170e27ae0424375..dcbf43a8a4b92099eec3d2a96493088218929029 100644
--- a/plugins/UserCountry/Controller.php
+++ b/plugins/UserCountry/Controller.php
@@ -18,10 +18,10 @@ use Piwik\Common;
use Piwik\Http;
use Piwik\IP;
use Piwik\Plugins\UserCountry\LocationProvider;
-use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
+
use Piwik\ViewDataTable;
use Piwik\View;
-use Piwik\Url;
+
use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Pecl;
diff --git a/plugins/UserCountry/GeoIPAutoUpdater.php b/plugins/UserCountry/GeoIPAutoUpdater.php
index 2bd9362fea5cc7af0ac5a19cc9b605bc3571cad2..52645a34cf6619ac87cdcf94c7988d1a664ece12 100755
--- a/plugins/UserCountry/GeoIPAutoUpdater.php
+++ b/plugins/UserCountry/GeoIPAutoUpdater.php
@@ -11,7 +11,7 @@
namespace Piwik\Plugins\UserCountry;
use Exception;
-use Piwik\Piwik;
+
use Piwik\Log;
use Piwik\Common;
use Piwik\Date;
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/Php.php b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
index e3fd8a369a33513dd7062b9b0a750d41edc3f5d8..e01ddc3b10571baa91cbc30babaec4e9483e6cfa 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/Php.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/Php.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Piwik;
+
use Piwik\Log;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
diff --git a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
index 7d2be065d2f6e77731d552524b098b36cd62613c..746bfa9d15d420f00ca3d4a89025ad7c337d3e5b 100755
--- a/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
+++ b/plugins/UserCountry/LocationProvider/GeoIp/ServerBased.php
@@ -15,8 +15,6 @@ use Piwik\Common;
use Piwik\IP;
use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Pecl;
-use Piwik\Plugins\UserCountry\LocationProvider\GeoIp\Php;
/**
* 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 53e9ce380d8d1544641b72fb68e3b113c859d7fe..8e81703975dd9eb9901cd34ae08bf8a1d7d6a484 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -16,8 +16,7 @@ use Piwik\Piwik;
use Piwik\WidgetsList;
use Piwik\Url;
use Piwik\IP;
-use Piwik\Plugins\UserCountry\Archiver;
-use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;
+
use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php
index cae545f5219ce83e5d3225beaaad9430bc5e0b29..25193da1446a38a3bd1f313a2e1ed31403616450 100644
--- a/plugins/UserCountry/functions.php
+++ b/plugins/UserCountry/functions.php
@@ -12,7 +12,7 @@
namespace Piwik\Plugins\UserCountry;
use Piwik\DataTable;
-use Piwik\Plugins\UserCountry\Archiver;
+
use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
use Piwik\Tracker\Visit;
diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php
index c066635cfc0a1011d6995d412bdf7e36857ebfd7..bd69aa929c97464afb8b2d07cf816050874aa05e 100644
--- a/plugins/UserSettings/API.php
+++ b/plugins/UserSettings/API.php
@@ -14,7 +14,6 @@ use Piwik\Archive;
use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\DataTable;
-use Piwik\Plugins\UserSettings\Archiver;
/**
* @see plugins/UserSettings/functions.php
diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php
index aae94c2cbf2f75027fa28015d052dc786238bdfa..dd1ba2e4a3c4bea16ead550832e8880ff884dcc6 100644
--- a/plugins/UserSettings/UserSettings.php
+++ b/plugins/UserSettings/UserSettings.php
@@ -11,7 +11,7 @@
namespace Piwik\Plugins\UserSettings;
use Piwik\ArchiveProcessor;
-use Piwik\Plugins\UserSettings\Archiver;
+
use Piwik\WidgetsList;
/**
diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php
index 06fcae389e4455e0069dd90f7fac03b85224c3a9..b1868c01c85c93e7d92719b05353d4404d35a936 100644
--- a/plugins/UserSettings/functions.php
+++ b/plugins/UserSettings/functions.php
@@ -12,7 +12,7 @@
namespace Piwik\Plugins\UserSettings;
use Piwik\Piwik;
-use Piwik\Plugins\UserSettings\UserSettings;
+
use Piwik\Tracker\Request;
use UserAgentParser;
diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php
index 9a038231346f5fd8c141ebccd93994363d9c8de0..3199ec5c446a95bd67305bba9749d707893ae6f2 100644
--- a/plugins/UsersManager/API.php
+++ b/plugins/UsersManager/API.php
@@ -19,7 +19,6 @@ use Piwik\Date;
use Piwik\Site;
use Piwik\Db;
use Piwik\Tracker\Cache;
-use Piwik\Plugins\UsersManager\UsersManager;
/**
* The UsersManager API lets you Manage Users and their permissions to access specific websites.
diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index 25d1ae8a81b2d821dabb638fc33b6ea88c3ce17b..921412d0c87b8f784adb8338321870f3acd9818f 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -18,7 +18,6 @@ use Piwik\Piwik;
use Piwik\Date;
use Piwik\DataTable;
use Piwik\Site;
-use Piwik\Plugins\VisitTime\Archiver;
require_once PIWIK_INCLUDE_PATH . '/plugins/VisitTime/functions.php';
diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php
index 161c1edd3e885f7fe06eb2b3419b329c64b2c79c..186b27bb4c9fd3293a6a89d45c12e29484e4ab74 100644
--- a/plugins/VisitTime/VisitTime.php
+++ b/plugins/VisitTime/VisitTime.php
@@ -14,7 +14,7 @@ use Exception;
use Piwik\ArchiveProcessor;
use Piwik\Common;
use Piwik\Period;
-use Piwik\Plugins\VisitTime\Archiver;
+
use Piwik\Site;
use Piwik\WidgetsList;
diff --git a/plugins/VisitorInterest/API.php b/plugins/VisitorInterest/API.php
index d1cf937d0fa607097e104ab7448af65ae2293cfa..583c09387f0f16777446a69e95b4681a5fb19da5 100644
--- a/plugins/VisitorInterest/API.php
+++ b/plugins/VisitorInterest/API.php
@@ -14,7 +14,6 @@ use Piwik\Archive;
use Piwik\Metrics;
use Piwik\Piwik;
use Piwik\DataTable;
-use Piwik\Plugins\VisitorInterest\Archiver;
/**
* VisitorInterest API lets you access two Visitor Engagement reports: number of visits per number of pages,
diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php
index 5475d6cba8378e8d1ce90f287259a97dc12b0912..634b8e17df6e1411158227754eaca495354b8031 100644
--- a/plugins/VisitorInterest/Controller.php
+++ b/plugins/VisitorInterest/Controller.php
@@ -10,7 +10,7 @@
*/
namespace Piwik\Plugins\VisitorInterest;
-use Piwik\Metrics;
+
use Piwik\ViewDataTable;
use Piwik\View;
diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php
index 81f2079552c6d4ebc7fe2f168edb5ed411192a00..74dbb8579849613994d8a0e4638360c2f148e8fc 100644
--- a/plugins/VisitorInterest/VisitorInterest.php
+++ b/plugins/VisitorInterest/VisitorInterest.php
@@ -13,7 +13,7 @@ namespace Piwik\Plugins\VisitorInterest;
use Piwik\ArchiveProcessor;
use Piwik\FrontController;
use Piwik\Metrics;
-use Piwik\Plugins\VisitorInterest\Archiver;
+
use Piwik\WidgetsList;
/**
diff --git a/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php b/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php
index 7c8e1418fc776683143b087f0c9f332895cd3d29..6f4c9c35b9f28f0ef21c8fe628f48c804dd98760 100755
--- a/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php
+++ b/tests/PHPUnit/Benchmarks/Fixtures/ThousandSitesTwelveVisitsEachOneDay.php
@@ -7,7 +7,6 @@
*/
use Piwik\Date;
use Piwik\Plugins\Goals\API as APIGoals;
-use Piwik\Plugins\SitesManager\API as APISitesManager;
/**
* Reusable fixture. Tracks twelve thousand page views for 1000 sites on one day.
diff --git a/tests/PHPUnit/Core/ServeStaticFileTest.php b/tests/PHPUnit/Core/ServeStaticFileTest.php
index 0776f1c9aaa5bc12e834307555d81951dc4678b4..9f2089d4f10886279a59ee434d8daab8a573cca9 100644
--- a/tests/PHPUnit/Core/ServeStaticFileTest.php
+++ b/tests/PHPUnit/Core/ServeStaticFileTest.php
@@ -12,7 +12,7 @@
*/
// This is Piwik logo, the static file used in this test suit
-use Piwik\Piwik;
+
use Piwik\ProxyHttp;
use Piwik\SettingsServer;
diff --git a/tests/PHPUnit/Core/Translate/WriterTest.php b/tests/PHPUnit/Core/Translate/WriterTest.php
index f63bcc2c436230401269cae8d06c9e6d73e3fb11..18c4ee6deb46fc638c7e187a36debd98af0f6146 100644
--- a/tests/PHPUnit/Core/Translate/WriterTest.php
+++ b/tests/PHPUnit/Core/Translate/WriterTest.php
@@ -1,5 +1,5 @@
<?php
-use Piwik\Common;
+
use Piwik\Translate\Writer;
use Piwik\Translate\Validate\CoreTranslations;
use Piwik\Translate\Validate\NoScripts;
diff --git a/tests/PHPUnit/Core/TranslateTest.php b/tests/PHPUnit/Core/TranslateTest.php
index 3acc545f778abde192e9d54722b279f0a56d4086..551e25a972e91c23a9eb8f7f8646a6e504fee1cd 100644
--- a/tests/PHPUnit/Core/TranslateTest.php
+++ b/tests/PHPUnit/Core/TranslateTest.php
@@ -1,5 +1,5 @@
<?php
-use Piwik\Common;
+
use Piwik\Translate;
/**
diff --git a/tests/PHPUnit/Integration/ArchiveCronTest.php b/tests/PHPUnit/Integration/ArchiveCronTest.php
index 744d149ca8f6a8e6462d23cefe9cac6441dc8fba..ddfa87cfb2ce021a5c70afd92788ae6931a91fdd 100644
--- a/tests/PHPUnit/Integration/ArchiveCronTest.php
+++ b/tests/PHPUnit/Integration/ArchiveCronTest.php
@@ -5,7 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Piwik;
+
use Piwik\Access;
use Piwik\Date;
use Piwik\Plugins\SitesManager\API;
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
index 033e13ee161ded92e8f78cf627666a0e9846850d..5d3bb39be712750af0c73892fa22f4c97fcdf2e5 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -5,7 +5,7 @@
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
*/
-use Piwik\Piwik;
+
use Piwik\Plugins\UserCountry;
use Piwik\Plugins\UserCountry\LocationProvider;
use Piwik\Plugins\UserCountry\GeoIPAutoUpdater;