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

71 files changed, 57 insertions, 91 deletions

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;
 
 /**