refs #4123 Removing unused imports (using phpstorm Inspections>Fix feature)

156 files changed, 114 insertions, 217 deletions

diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
index 418ef7aed5..45bebbf4ac 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 a419895a42..a7e2559aca 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 87da4a0b32..7aeb474e02 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 6e13db6579..2f2d369185 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 694cf55e05..05c6dc2ab3 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 d37c4d5b5c..0bc89d5bbd 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 70d8e3fe3a..09576d8c65 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 6f46eb1d72..bcd4516594 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 21692f460a..c072ac751e 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 e29d7eed6c..b3538b5b79 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 34a9dd831c..080a71d846 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 5c2570392d..8c22414821 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 5760483c95..08eb02ea79 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 43cb33f2a0..5b79a0c8bc 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 32fc8df72b..8fa4af3f34 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 5e2c0c1336..917ba1c2a7 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 f8fcb59b77..997ea2e70c 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 68d26b33d4..a0b8e0c14c 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 d22c61a83f..689a64a204 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 4b2110eff3..26f1b12433 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 e10119c9fe..56f9b6b056 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 168c6a520a..9f98af0209 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 2872889f6f..1d82e1c52f 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 3f6aea5b53..97c9b8875a 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 cabfb50f62..4e2d251cd6 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 8a3cde70c6..f0e1303a64 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 d795a9b3f6..e6b7e8e1b4 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 55283b608d..dbcff64b59 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 c7bc3184de..f5cca965ea 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 b186cdd731..dd6aac105b 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 641e654252..5122250b08 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 7f93fd444b..1321aae0cc 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 911f1f5f32..78b18ea528 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 73200b4857..81df27bef3 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 c3da2871d3..8a2548b915 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 828f82517a..52b64262ed 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 31c8fbb86a..b39ce1b30f 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 dab41eac1e..e4a33480dd 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 b8867cbea5..f875e89311 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 78ac50538e..0650f44883 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 06bd605311..48406fb83c 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 dd4b1d9c06..e016da3ff5 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 393c0b6878..d6fa964916 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 1b59f48e2c..4299f2673c 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 8febecde99..63a293c3c0 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 e54201c4ef..93749321db 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 78982741b2..6d7e189b0a 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 4ad407f3ee..c29117f49f 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 07d9c9f883..7411d34897 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 3de11b9c3a..19d5edcaef 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 a19a546dab..df511d1464 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 495975c1f6..a97fc31621 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 8bc1a7b3c7..1d7880be35 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 0fe9e4e7a1..77805b47b9 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 ef43742d4c..03abcabd22 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 25fb11a6cb..f77a7d7c92 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 9365b706bd..8f16bb1650 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 7df96eb24a..cce699bb62 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 a9a74635f5..bba1d5c483 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 918274dad8..a62879af11 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 174d51ccaf..cfcfc7f6af 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 d5083a6fad..d6b9786735 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 c5a8dcf0aa..25c6853671 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 6dae9b267d..900bac5327 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 46648dedbe..5a7c0ebc11 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 9e8fc59592..c7751e81e4 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 705eee93a1..4eb7d93e29 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 0e0e80d01b..1aa45fa633 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 5ad6191681..2d4771c617 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 3e1bac6364..ba0609dd26 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 1e95872cb7..7a058ae902 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 770a69eff3..f381ec6c65 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 6d431910b8..3566ecc5c0 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 e54ff50569..afecf07680 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 f07ae88cb0..c0b6c9bcc2 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 a12a6b63ba..fceb66a197 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 81eabc0234..9929b663cc 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 8930cb9696..25c8abe865 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 77c84cdc4f..2c58ea2a49 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 b01c98f87b..a88dc1c230 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 c177a73ffe..a45545574e 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 0e946b7302..21ea6f8a53 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 00a927fe6d..968baef392 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 b075d1a56b..1760c6ca3e 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 e20a394d06..bedbbbd174 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 f9cc574fab..1dbe50a2fc 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 12d3a92955..220e24030c 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 b43b4feda1..16adfc56db 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 50533b1506..024975bc29 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 411dbef0d9..5cb54b0fc4 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 680d0462af..2bb20770b6 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 03ff437a5d..f8529c74da 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 817015c2cc..a5b6d7b53e 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 3fabe7cf55..4bc1ca8229 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 029a17a5eb..602f3ca383 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 6c033a9c40..18e75f2cc1 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 6eae635bd1..d7e1fc8808 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 7e42e6de49..4a147427e7 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 d4d3cb7884..2980a43310 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 7f8dd16edf..06f26a2aa2 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 11788d19a1..2f63fcea9a 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 6e5f322191..047d599eea 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 bded95b33e..c919230db7 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 56cc537ffe..ae9ba66cae 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 05ee0a6928..6a2001453c 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 a8a5eb7247..68320fc9eb 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 6f7c769d5f..65fb1c7d82 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 1fbdc79bff..66db3c2cbd 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 419ab876e1..35be905257 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 239ccf2b36..297dd3d29c 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 18e89766c7..775dad2b5b 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 f3be3b18be..d0f7041401 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 3bc870b9b6..39eb88cabd 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 64ebf2d4e5..49fc5c642b 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 1626ebd3fc..200b273293 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 add00e6423..273ade455b 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 a7977a5349..9911ae5eef 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 ae7f2e8129..e286ef8e98 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 ab2b137603..47c9799076 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 5b688521a4..ce862e1f41 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 537a0fa3bc..32c0e1ac21 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 338dce98f6..f68d8cfeac 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 0d3ea6e9b0..e7aa7ced85 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 0e08ac8cc8..760b10ae50 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 9a60af5781..7fefd0c260 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 5831ccd0f0..9d397d6f33 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 88eb4b473b..106fbd5883 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 77ce6ea7a1..18c11f1e48 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 307e20fc78..e1c380dda1 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 373a2eabea..70caeb6dc5 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 1e1180301f..3d3cd019e1 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 f743692b4a..8cee3bc124 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 5c77fd02da..f0cea48e26 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 69b4946350..a3311bf100 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 b62076385c..c74d6eb915 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 c79f348512..dcbf43a8a4 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 2bd9362fea..52645a34cf 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 e3fd8a369a..e01ddc3b10 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 7d2be065d2..746bfa9d15 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 53e9ce380d..8e81703975 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 cae545f521..25193da144 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 c066635cfc..bd69aa929c 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 aae94c2cbf..dd1ba2e4a3 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 06fcae389e..b1868c01c8 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 9a03823134..3199ec5c44 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 25d1ae8a81..921412d0c8 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 161c1edd3e..186b27bb4c 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 d1cf937d0f..583c09387f 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 5475d6cba8..634b8e17df 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 81f2079552..74dbb85798 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 7c8e1418fc..6f4c9c35b9 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 0776f1c9aa..9f2089d4f1 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 f63bcc2c43..18c4ee6deb 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 3acc545f77..551e25a972 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 744d149ca8..ddfa87cfb2 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 033e13ee16..5d3bb39be7 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;