diff --git a/core/Application/Kernel/EnvironmentValidator.php b/core/Application/Kernel/EnvironmentValidator.php
index c8960c48eb9b3b41ba0b1b2348140cfd666122b1..321be28ef1e28d3595852b881a942d6df1b3dfb6 100644
--- a/core/Application/Kernel/EnvironmentValidator.php
+++ b/core/Application/Kernel/EnvironmentValidator.php
@@ -11,7 +11,6 @@ namespace Piwik\Application\Kernel;
 use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\SettingsServer;
-use Piwik\Translate;
 use Piwik\Translation\Translator;
 
 /**
diff --git a/core/Date.php b/core/Date.php
index cbbe8667080c37f11877af618303ddd8effcb0df..be009fe54bc70a8ef4ef29ba894d0c53f37eaa62 100644
--- a/core/Date.php
+++ b/core/Date.php
@@ -12,7 +12,6 @@ namespace Piwik;
 use Exception;
 use Piwik\Container\StaticContainer;
 use Piwik\Intl\Data\Provider\DateTimeFormatProvider;
-use Piwik\Plugins\LanguagesManager\LanguagesManager;
 
 /**
  * Utility class that wraps date/time related PHP functions. Using this class can
diff --git a/core/Metrics/Formatter.php b/core/Metrics/Formatter.php
index d62db65f31cf5a7f3f570f586bab0e3b97deab45..078edb2339cfdccdad77a253b88dba6e9b071451 100644
--- a/core/Metrics/Formatter.php
+++ b/core/Metrics/Formatter.php
@@ -8,9 +8,7 @@
 namespace Piwik\Metrics;
 
 use Piwik\Common;
-use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
-use Piwik\Intl\Data\Provider\CurrencyDataProvider;
 use Piwik\NumberFormatter;
 use Piwik\Piwik;
 use Piwik\Plugin\Metric;
diff --git a/core/Period/Day.php b/core/Period/Day.php
index bcad4cc1a631abb0305ec1b17c2104a5ab8d162c..108d42e277f9fa9e03beb31ef4137da1e8e3e0ab 100644
--- a/core/Period/Day.php
+++ b/core/Period/Day.php
@@ -11,7 +11,6 @@ namespace Piwik\Period;
 use Exception;
 use Piwik\Date;
 use Piwik\Period;
-use Piwik\Piwik;
 
 /**
  */
diff --git a/core/Period/Range.php b/core/Period/Range.php
index 0625b2da47aa18733d2dbc82c9e8649a6051bdba..7073ad2c16f4c7bc759d4b887592a2484a3062b1 100644
--- a/core/Period/Range.php
+++ b/core/Period/Range.php
@@ -14,7 +14,6 @@ use Piwik\Common;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
 use Piwik\Period;
-use Piwik\Piwik;
 
 /**
  * Arbitrary date range representation.
diff --git a/core/Period/Week.php b/core/Period/Week.php
index db644be265b9c1b970ec165bd06e20f2581fa2c4..0029855a3ce58579087540da72ebc49b6f4ec2f8 100644
--- a/core/Period/Week.php
+++ b/core/Period/Week.php
@@ -9,7 +9,6 @@
 namespace Piwik\Period;
 
 use Piwik\Period;
-use Piwik\Piwik;
 
 /**
  */
diff --git a/core/Plugin/ControllerAdmin.php b/core/Plugin/ControllerAdmin.php
index 6ecca10243c5c846193b497ed394725bfd33f589..8e4715cfb9ea41e5c46fba8f8bbd02fa8f960f1b 100644
--- a/core/Plugin/ControllerAdmin.php
+++ b/core/Plugin/ControllerAdmin.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugin;
 
 use Piwik\Config as PiwikConfig;
 use Piwik\Config;
-use Piwik\Date;
 use Piwik\Development;
 use Piwik\Menu\MenuAdmin;
 use Piwik\Menu\MenuTop;
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index c3974937a0df2c4dc53bd650094f1eb49707d9bb..63a3e0aaafca5317182c36c0b0b1fbf994db4473 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -18,7 +18,6 @@ use Piwik\Container\StaticContainer;
 use Piwik\EventDispatcher;
 use Piwik\Filesystem;
 use Piwik\Log;
-use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\PluginDeactivatedException;
diff --git a/core/Tracker.php b/core/Tracker.php
index fa774112c37b97dfe47c693e2d3d43fb759ce943..d64f1b7fa87d0d4430455389c859fef7590ac799 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -12,7 +12,6 @@ use Exception;
 use Piwik\Plugins\BulkTracking\Tracker\Requests;
 use Piwik\Plugins\PrivacyManager\Config as PrivacyManagerConfig;
 use Piwik\Config;
-use Piwik\Tests\Framework\TestingEnvironmentVariables;
 use Piwik\Tracker\Db as TrackerDb;
 use Piwik\Tracker\Db\DbException;
 use Piwik\Tracker\Handler;
diff --git a/core/Tracker/ScheduledTasksRunner.php b/core/Tracker/ScheduledTasksRunner.php
index c8e8b89ce348a018101f8da340bad3962585f255..6c1f230b60a005bb9f26f4e7756c6fa0377bac04 100644
--- a/core/Tracker/ScheduledTasksRunner.php
+++ b/core/Tracker/ScheduledTasksRunner.php
@@ -12,7 +12,6 @@ namespace Piwik\Tracker;
 use Piwik\CliMulti;
 use Piwik\Common;
 use Piwik\Option;
-use Piwik\Piwik;
 use Piwik\Tracker;
 
 class ScheduledTasksRunner
diff --git a/plugins/API/Controller.php b/plugins/API/Controller.php
index 3f5f96d9de252b660ac6470e5e94838cac930f5b..5a15c6dbe7f2706c53cdab49ca03c41671072cac 100644
--- a/plugins/API/Controller.php
+++ b/plugins/API/Controller.php
@@ -13,7 +13,6 @@ use Piwik\API\Proxy;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Config;
-use Piwik\Container\StaticContainer;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Url;
diff --git a/plugins/API/RowEvolution.php b/plugins/API/RowEvolution.php
index 711a48316ca5823a5c14615021d745a923055698..b8afec8e3991ec4f5896b2ab3aee714e7578f933 100644
--- a/plugins/API/RowEvolution.php
+++ b/plugins/API/RowEvolution.php
@@ -12,7 +12,6 @@ use Exception;
 use Piwik\API\DataTableManipulator\LabelFilter;
 use Piwik\API\DataTablePostProcessor;
 use Piwik\API\Request;
-use Piwik\API\ResponseBuilder;
 use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\DataTable\Filter\CalculateEvolutionFilter;
diff --git a/plugins/API/tests/Integration/RssRendererTest.php b/plugins/API/tests/Integration/RssRendererTest.php
index daf73d5a8cc4a5004a25cfd92b42afae1c3e5266..555e3f6bcd92822be315a863207bfa95ea6027d6 100644
--- a/plugins/API/tests/Integration/RssRendererTest.php
+++ b/plugins/API/tests/Integration/RssRendererTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Plugins\API\tests\Integration;
 
-use Piwik\Access;
 use Piwik\DataTable;
 use Piwik\Plugins\API\Renderer\Rss;
 use Piwik\Tests\Framework\Fixture;
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index dfd773bea4ff8f6095ef6e2a8294e264f9d98bc0..bf47a6b9fa0990d7bbead876135345ab16ba972d 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\Actions;
 
 use Piwik\ArchiveProcessor;
-use Piwik\Common;
 use Piwik\Db;
 use Piwik\Site;
 use Piwik\Plugin\ViewDataTable;
diff --git a/plugins/Actions/Metrics.php b/plugins/Actions/Metrics.php
index 006fd6043dd633f6039cafa3ac60969627a464ab..d7aa94fc8038b9e8dc8f6240d8d9d2aaf671d77e 100644
--- a/plugins/Actions/Metrics.php
+++ b/plugins/Actions/Metrics.php
@@ -11,9 +11,7 @@ namespace Piwik\Plugins\Actions;
 use Piwik\DataTable;
 use Piwik\Metrics as PiwikMetrics;
 use Piwik\Piwik;
-use Piwik\RankingQuery;
 use Piwik\Tracker\Action;
-use Piwik\Plugins\Actions\Actions\ActionSiteSearch;
 
 /**
  * Class encapsulating logic to process Day/Period Archiving for the Actions reports
diff --git a/plugins/Actions/Reports/GetEntryPageUrls.php b/plugins/Actions/Reports/GetEntryPageUrls.php
index f3795db0993947ad0788cce46ef34a3ce43cc782..838bb414d0b5271e78b97c2f6e11989a1625c2f4 100644
--- a/plugins/Actions/Reports/GetEntryPageUrls.php
+++ b/plugins/Actions/Reports/GetEntryPageUrls.php
@@ -8,10 +8,8 @@
  */
 namespace Piwik\Plugins\Actions\Reports;
 
-use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
-use Piwik\API\Request;
 use Piwik\Plugins\Actions\Columns\EntryPageUrl;
 use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
 use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
diff --git a/plugins/Actions/Reports/GetExitPageUrls.php b/plugins/Actions/Reports/GetExitPageUrls.php
index 2ef5d7a95751d2b88a3f6ead53b3d4548f74f92c..092a54adfe55258b925c965129dc68f5729c89a0 100644
--- a/plugins/Actions/Reports/GetExitPageUrls.php
+++ b/plugins/Actions/Reports/GetExitPageUrls.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\Actions\Reports;
 
-use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\API\Request;
diff --git a/plugins/Actions/Reports/GetPageTitles.php b/plugins/Actions/Reports/GetPageTitles.php
index 8f7e193f9b27ce64bd3e02d3dd4a69468754bc99..1466efce8a18a461ea008c52daab5b0c2bd014cc 100644
--- a/plugins/Actions/Reports/GetPageTitles.php
+++ b/plugins/Actions/Reports/GetPageTitles.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\Actions\Reports;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
 use Piwik\API\Request;
-use Piwik\Common;
 use Piwik\Plugins\Actions\Columns\PageTitle;
 use Piwik\Plugins\Actions\Columns\Metrics\AveragePageGenerationTime;
 use Piwik\Plugins\Actions\Columns\Metrics\AverageTimeOnPage;
diff --git a/plugins/Annotations/Controller.php b/plugins/Annotations/Controller.php
index 2572864a806fb06693ea577637fc17390a455191..86859bd37fec8859966c38a44afce9f20d2249f1 100755
--- a/plugins/Annotations/Controller.php
+++ b/plugins/Annotations/Controller.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\Annotations;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\Date;
-use Piwik\Piwik;
 use Piwik\View;
 
 /**
diff --git a/plugins/BulkTracking/Tracker/Handler.php b/plugins/BulkTracking/Tracker/Handler.php
index 9c1d23c9618a99053a72b129be18e04cbcff023f..c68667f062b327d4ab1865fc5516e2b46a0f6a76 100644
--- a/plugins/BulkTracking/Tracker/Handler.php
+++ b/plugins/BulkTracking/Tracker/Handler.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Plugins\BulkTracking\Tracker;
 
-use Piwik\Archiver\Request;
 use Piwik\AuthResult;
 use Piwik\Container\StaticContainer;
 use Piwik\Exception\InvalidRequestParameterException;
diff --git a/plugins/BulkTracking/tests/Integration/TrackerTest.php b/plugins/BulkTracking/tests/Integration/TrackerTest.php
index a872b0524c1781ae9ad8e8b0986cb5b35aa88300..cc51d0a851b8bb91fff25311a4b92d4cbdd18ce9 100644
--- a/plugins/BulkTracking/tests/Integration/TrackerTest.php
+++ b/plugins/BulkTracking/tests/Integration/TrackerTest.php
@@ -15,7 +15,6 @@ use Piwik\Plugins\BulkTracking\tests\Framework\TestCase\BulkTrackingTestCase;
 use Piwik\Plugins\BulkTracking\Tracker\Handler;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tracker;
-use Piwik\Translate;
 use Piwik\Tests\Framework\Mock\Tracker\RequestSet;
 
 class TestIntegrationTracker extends Tracker {
diff --git a/plugins/Contents/Columns/ContentTarget.php b/plugins/Contents/Columns/ContentTarget.php
index 5f6bd47e546483922a66b2fe267e67392b93e841..26c7a0d7a2589a9a3987719d6a0a88a21811c8fd 100644
--- a/plugins/Contents/Columns/ContentTarget.php
+++ b/plugins/Contents/Columns/ContentTarget.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\Contents\Columns;
 use Piwik\Piwik;
 use Piwik\Plugin\Dimension\ActionDimension;
 use Piwik\Plugins\Actions\Segment;
-use Piwik\Plugins\Contents\Actions\ActionContent;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\Request;
 
diff --git a/plugins/Contents/Reports/Base.php b/plugins/Contents/Reports/Base.php
index f07baf973da4320fa5e75ae9c58b363e6c142e79..b1ea92d075dbdfe90b8edcdd503e0722e52ed6bf 100644
--- a/plugins/Contents/Reports/Base.php
+++ b/plugins/Contents/Reports/Base.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\Contents\Reports;
 
-use Piwik\Columns\Dimension;
 use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
diff --git a/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php b/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php
index 7c474d9c8b5ed031643a73a6f81278899367fa30..6b47e946a53d453585bd3368a29b4f2d2a5f0c3e 100644
--- a/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php
+++ b/plugins/CoreAdminHome/tests/Integration/Commands/DeleteLogsDataTest.php
@@ -7,12 +7,10 @@
  */
 namespace Piwik\Plugins\CoreAdminHome\tests\Integration\Commands;
 
-use Piwik\Common;
 use Piwik\Container\StaticContainer;
 use Piwik\DataAccess\RawLogDao;
 use Piwik\Tests\Fixtures\ManySitesImportedLogs;
 use Piwik\Tests\Framework\TestCase\ConsoleCommandTestCase;
-use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Symfony\Component\Console\Helper\QuestionHelper;
 
 /**
diff --git a/plugins/CoreConsole/Commands/GenerateDimension.php b/plugins/CoreConsole/Commands/GenerateDimension.php
index 248adc8486fcb5bc4fd7783a82d7934193b724e7..900b6c0533611bc0125a3a9f224eed50f44e7834 100644
--- a/plugins/CoreConsole/Commands/GenerateDimension.php
+++ b/plugins/CoreConsole/Commands/GenerateDimension.php
@@ -12,7 +12,6 @@ namespace Piwik\Plugins\CoreConsole\Commands;
 use Piwik\Common;
 use Piwik\DbHelper;
 use Piwik\Plugin\Report;
-use Piwik\Translate;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/plugins/CoreConsole/Commands/GitPull.php b/plugins/CoreConsole/Commands/GitPull.php
index e69c13bf10416e9fcb98f0b2771bad8d4025c5b0..aefbd18d694c6137c7ccab6a5027583c57ec7217 100644
--- a/plugins/CoreConsole/Commands/GitPull.php
+++ b/plugins/CoreConsole/Commands/GitPull.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Plugins\CoreConsole\Commands;
 
-use Piwik\Development;
 use Piwik\Plugin\ConsoleCommand;
 use Piwik\SettingsPiwik;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/plugins/CoreHome/Columns/Metrics/ActionsPerVisit.php b/plugins/CoreHome/Columns/Metrics/ActionsPerVisit.php
index 0ced9580867e3cf06c354b8310e569fee7ec11b2..ef2aaa15140365cf0e22e249389865c1c78743d5 100644
--- a/plugins/CoreHome/Columns/Metrics/ActionsPerVisit.php
+++ b/plugins/CoreHome/Columns/Metrics/ActionsPerVisit.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\CoreHome\Columns\Metrics;
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
 use Piwik\Plugin\ProcessedMetric;
-use Piwik\Translate;
 
 /**
  * The average number of actions per visit. Calculated as:
diff --git a/plugins/CoreHome/Columns/UserId.php b/plugins/CoreHome/Columns/UserId.php
index a611ca8def39837e143e2bb8d0b0ddea839c7bb5..4534dac531b1a962424fb6cfa0c197af7a8cfdc5 100644
--- a/plugins/CoreHome/Columns/UserId.php
+++ b/plugins/CoreHome/Columns/UserId.php
@@ -12,7 +12,6 @@ use Piwik\Cache;
 use Piwik\DataTable;
 use Piwik\DataTable\Map;
 use Piwik\Metrics;
-use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Plugin\Segment;
diff --git a/plugins/CoreHome/Columns/VisitTotalTime.php b/plugins/CoreHome/Columns/VisitTotalTime.php
index 22afceb6a59de61efc25027dc9fdeadc33c24305..54b8a7ab439f50874419a5b13638c0f17c3c67f1 100644
--- a/plugins/CoreHome/Columns/VisitTotalTime.php
+++ b/plugins/CoreHome/Columns/VisitTotalTime.php
@@ -12,7 +12,6 @@ use Piwik\Config;
 use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Plugins\CoreHome\Segment;
 use Piwik\Tracker\Action;
-use Piwik\Tracker\GoalManager;
 use Piwik\Tracker\Request;
 use Piwik\Tracker\Visitor;
 
diff --git a/plugins/CoreHome/tests/Integration/Column/UserIdTest.php b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php
index 70715a4dc2d6761e1bd35924a6ee5152e017cac3..738a9f13f7df2ecec6176b45e32b0e0dfd401952 100644
--- a/plugins/CoreHome/tests/Integration/Column/UserIdTest.php
+++ b/plugins/CoreHome/tests/Integration/Column/UserIdTest.php
@@ -8,12 +8,10 @@
 
 namespace Piwik\Plugins\CoreHome\tests\Integration\Column;
 
-use Piwik\Access;
 use Piwik\Cache;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Db;
 use Piwik\Metrics;
-use Piwik\Plugin\Manager;
 use Piwik\Plugins\CoreHome\Columns\UserId;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
diff --git a/plugins/CoreHome/tests/Integration/CoreHomeTest.php b/plugins/CoreHome/tests/Integration/CoreHomeTest.php
index b04c98df64e3346b6e6036b1317dea6a0784bc7b..c93e6d129b432d07b5093c9fc45fd8dc93fee102 100644
--- a/plugins/CoreHome/tests/Integration/CoreHomeTest.php
+++ b/plugins/CoreHome/tests/Integration/CoreHomeTest.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\CoreHome\tests\Integration;
 
 use Piwik\Piwik;
-use Piwik\Plugins\CoreHome\CoreHome;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 
 /**
diff --git a/plugins/CoreHome/tests/Unit/CoreHomeTest.php b/plugins/CoreHome/tests/Unit/CoreHomeTest.php
index e40f7bf5d3701f00c3c22f3a30d4cf5847e09f66..2936cd860d308a1a091f07f3d08c9c682f4d65fc 100644
--- a/plugins/CoreHome/tests/Unit/CoreHomeTest.php
+++ b/plugins/CoreHome/tests/Unit/CoreHomeTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Plugins\CoreHome\tests\Unit;
 
-use Piwik\Piwik;
 use Piwik\Plugins\CoreHome\CoreHome;
 
 /**
diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php
index b46d1932e44355abc968a47c45f450c487924d89..5fcd51641d9e9c4504a1270e43b87c2ae2cca573 100644
--- a/plugins/CorePluginsAdmin/Marketplace.php
+++ b/plugins/CorePluginsAdmin/Marketplace.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\CorePluginsAdmin;
 
 use Piwik\Date;
-use Piwik\Piwik;
 use Piwik\Plugin\Dependency as PluginDependency;
 
 /**
diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php
index 737017d0484f3bcb1ff33bd45f2abc63f1e95be3..77298402fe0b7e771b9687b4c38d2281a17ada81 100644
--- a/plugins/CoreUpdater/CoreUpdater.php
+++ b/plugins/CoreUpdater/CoreUpdater.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\CoreUpdater;
 
 use Exception;
-use Piwik\Access;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
 use Piwik\Filesystem;
@@ -17,7 +16,6 @@ use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\UpdateCheck;
 use Piwik\Updater as PiwikCoreUpdater;
-use Piwik\UpdaterErrorException;
 use Piwik\Version;
 
 /**
diff --git a/plugins/DevicesDetection/DevicesDetection.php b/plugins/DevicesDetection/DevicesDetection.php
index 2fd7b59fd2e6826fb2cc39d66e53f459fe355ea0..ffebe3b37cf1c0b189c237e926c74c6dea1c14b3 100644
--- a/plugins/DevicesDetection/DevicesDetection.php
+++ b/plugins/DevicesDetection/DevicesDetection.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\DevicesDetection;
 
 use Piwik\ArchiveProcessor;
 use Piwik\Db;
-use Piwik\Piwik;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';
 
diff --git a/plugins/Ecommerce/Menu.php b/plugins/Ecommerce/Menu.php
index 992f50aa3cd0d56e2d4ee0ddb2a963c5fef20e7b..069ab48cb85f913e8a4839cf438bde1a19f11405 100644
--- a/plugins/Ecommerce/Menu.php
+++ b/plugins/Ecommerce/Menu.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\Ecommerce;
 
 use Piwik\Common;
 use Piwik\Menu\MenuReporting;
-use Piwik\Menu\MenuUser;
 use Piwik\Piwik;
 use Piwik\Site;
 use Piwik\Url;
diff --git a/plugins/Ecommerce/Reports/Base.php b/plugins/Ecommerce/Reports/Base.php
index 08a766792a2f0aa91da77e13e5dff0524342f02f..b4ec63c9a5a08906f6dbd1437a9190befe07a371 100644
--- a/plugins/Ecommerce/Reports/Base.php
+++ b/plugins/Ecommerce/Reports/Base.php
@@ -8,13 +8,10 @@
  */
 namespace Piwik\Plugins\Ecommerce\Reports;
 
-use Piwik\API\Proxy;
 use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Site;
-use Piwik\ViewDataTable\Factory as ViewDataTableFactory;
-use Piwik\WidgetsList;
 
 abstract class Base extends Report
 {
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 7a66581c69b283fcb58b61ef2dbbddb5bdef246d..4aac0eb73612a79c05c82d3ce7c3fcd12332e7ca 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\Goals;
 
-use Exception;
 use Piwik\API\Request;
 use Piwik\Common;
 use Piwik\DataTable;
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index d26e2cf77e5e4a01451607f7218396d9a7cefe07..223f05a21288429bbaa931461c5e0d1cdeeeee6e 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -9,12 +9,10 @@
 namespace Piwik\Plugins\Goals;
 
 use Piwik\ArchiveProcessor;
-use Piwik\Common;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugin\Report;
 use Piwik\Tracker\GoalManager;
-use Piwik\Translate;
 
 /**
  *
diff --git a/plugins/Goals/tests/Integration/APITest.php b/plugins/Goals/tests/Integration/APITest.php
index a55498f7f8611d0becb266c304a0c3ae1e8f60cd..913bebf0a69faa87ac06824c866a7f4ab2f14130 100644
--- a/plugins/Goals/tests/Integration/APITest.php
+++ b/plugins/Goals/tests/Integration/APITest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Plugins\Goals\tests\Integration;
 
-use Piwik\Access;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\API;
 use Piwik\Tests\Framework\Fixture;
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php
index e70e4f8fbe264e050773074daadb2e0b090d92ac..3cd7b738eee9a2a1a2564a62b2cf469f5d9bb779 100644
--- a/plugins/ImageGraph/StaticGraph.php
+++ b/plugins/ImageGraph/StaticGraph.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Plugins\ImageGraph;
 
-use Exception;
 use pData;
 use pImage;
 use Piwik\Container\StaticContainer;
diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php
index a542d6b5344d0997a069f5017441648d903ea441..50c7f0989fcd4dca581796aadaae7fa0c1084c40 100644
--- a/plugins/Installation/FormFirstWebsiteSetup.php
+++ b/plugins/Installation/FormFirstWebsiteSetup.php
@@ -12,7 +12,6 @@ namespace Piwik\Plugins\Installation;
 use HTML_QuickForm2_DataSource_Array;
 use HTML_QuickForm2_Factory;
 use HTML_QuickForm2_Rule;
-use Piwik\Log;
 use Piwik\Access;
 use Piwik\Piwik;
 use Piwik\Plugins\SitesManager\API;
diff --git a/plugins/Installation/Installation.php b/plugins/Installation/Installation.php
index 47602c8543228892aee6f37870de4949e9023bb5..59a0b02e6439c04200395f1d976d22ec168e1b00 100644
--- a/plugins/Installation/Installation.php
+++ b/plugins/Installation/Installation.php
@@ -9,13 +9,11 @@
 namespace Piwik\Plugins\Installation;
 
 use Piwik\API\Request;
-use Piwik\API\ResponseBuilder;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\FrontController;
 use Piwik\Piwik;
 use Piwik\Plugins\Installation\Exception\DatabaseConnectionFailedException;
-use Piwik\Translate;
 use Piwik\View as PiwikView;
 
 /**
diff --git a/plugins/LanguagesManager/Commands/TranslationBase.php b/plugins/LanguagesManager/Commands/TranslationBase.php
index 0f1b72bef40e51ab04e0986768ddd375c64009df..880b1b4b610e72875b150d13f9a3c86b67670037 100644
--- a/plugins/LanguagesManager/Commands/TranslationBase.php
+++ b/plugins/LanguagesManager/Commands/TranslationBase.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\LanguagesManager\Commands;
 
 use Piwik\Development;
 use Piwik\Plugin\ConsoleCommand;
-use Piwik\Translate;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index fa7be4dd63d0ea08cb2f4ca1e2bf03ccecea5bb1..1525bfa5cff006cd8d4a702b16c416eb2f9ee379 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\Live;
 
 use Piwik\Common;
-use Piwik\DataAccess\LogAggregator;
 use Piwik\DataTable\Filter\ColumnDelete;
 use Piwik\Date;
 use Piwik\Db;
diff --git a/plugins/Live/tests/System/APITest.php b/plugins/Live/tests/System/APITest.php
index 098e7615c5025a43f2fb9a839fe564714ace2257..dc0c04f7e5b66f8a96b32a6259ac4695a59424f3 100644
--- a/plugins/Live/tests/System/APITest.php
+++ b/plugins/Live/tests/System/APITest.php
@@ -12,7 +12,6 @@ use Piwik\Date;
 use Piwik\Db;
 use Piwik\Plugins\Goals\API as GoalsApi;
 use Piwik\Plugins\Live\API;
-use Piwik\Access;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\SystemTestCase;
diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php
index 23ae8217381cbfc35f75f8c337385a5e20f697cf..8e2ce0c1a323f9f6ccc5a5f492b13d6e21270159 100755
--- a/plugins/MultiSites/API.php
+++ b/plugins/MultiSites/API.php
@@ -19,7 +19,6 @@ use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Plugins\Goals\Archiver;
 use Piwik\Plugins\SitesManager\API as APISitesManager;
-use Piwik\Plugins\SitesManager\Model as ModelSitesManager;
 use Piwik\Scheduler\Scheduler;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index a59e8a4cdb1dae149bb2aaf5f28487ebe3e4ac22..ce5f599f132d76046d89647f4cc70f40e568ddff 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -8,15 +8,12 @@
  */
 namespace Piwik\Plugins\MultiSites;
 
-use Piwik\API\Request;
-use Piwik\API\ResponseBuilder;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
 use Piwik\Period;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\DataTable\Row\DataTableSummaryRow;
 use Piwik\Piwik;
 use Piwik\Translation\Translator;
 use Piwik\View;
diff --git a/plugins/Referrers/Social.php b/plugins/Referrers/Social.php
index 71badc3357a3e7b7eba58ef0e2b3a481929819cc..93766cddf1375559d7cc903fc7f58d33620f47c8 100644
--- a/plugins/Referrers/Social.php
+++ b/plugins/Referrers/Social.php
@@ -8,11 +8,9 @@
  */
 namespace Piwik\Plugins\Referrers;
 use Piwik\Cache;
-use Piwik\Common;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Singleton;
-use Piwik\UrlHelper;
 
 /**
  * Contains methods to access search engine definition data.
diff --git a/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php b/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
index 6c0bcfb1e0e896d9f9057527d86a202df756c484..f118e14ba6e2809eec9b6b40caf706a692cf9238 100644
--- a/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
+++ b/plugins/Referrers/tests/Integration/Columns/ReferrerNameTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Plugins\Referrers\tests\Integration\Columns;
 
-use Piwik\Common;
 use Piwik\Plugins\Referrers\Columns\ReferrerName;
 use Piwik\Plugins\Referrers\Columns\ReferrerType;
 use Piwik\Tests\Framework\Fixture;
diff --git a/plugins/Referrers/tests/Unit/ReferrersTest.php b/plugins/Referrers/tests/Unit/ReferrersTest.php
index e5dea866e90bc4fa1d3266aefdf5aa592c397364..a3ca59d2a3e8837b50c2916f1a0c512606465831 100644
--- a/plugins/Referrers/tests/Unit/ReferrersTest.php
+++ b/plugins/Referrers/tests/Unit/ReferrersTest.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\Referrers\tests;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Period;
-use Piwik\Plugins\Referrers\SearchEngine;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/Referrers/Referrers.php';
 
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index d5a985e65b4322977e937446232bc770e2c11633..aeef2f2ffb6beafa5f9cb4f8ab2fb370a5fee48c 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -27,7 +27,6 @@ use Piwik\Tracker;
 use Piwik\Translate;
 use Piwik\Translation\Translator;
 use Piwik\Url;
-use Piwik\UrlHelper;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/plugins/ScheduledReports/Controller.php b/plugins/ScheduledReports/Controller.php
index 2ae16cc410f2a791a1594c1a12f4c38404dda1d2..3192a3cfc4cd53e02a29d9afb14e46e16f3cdceb 100644
--- a/plugins/ScheduledReports/Controller.php
+++ b/plugins/ScheduledReports/Controller.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\ScheduledReports;
 
-use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugins\LanguagesManager\LanguagesManager;
 use Piwik\Plugins\SegmentEditor\API as APISegmentEditor;
diff --git a/plugins/ScheduledReports/Model.php b/plugins/ScheduledReports/Model.php
index 01507f65f9c41aaf2be2fd3dfe271688ac913d05..5c7856678ae27517bd6a346c4dd4dd9f1b52919c 100644
--- a/plugins/ScheduledReports/Model.php
+++ b/plugins/ScheduledReports/Model.php
@@ -12,7 +12,6 @@ use Piwik\Common;
 use Piwik\Db;
 use Piwik\DbHelper;
 use Piwik\ReportRenderer;
-use Piwik\Translate;
 
 class Model
 {
diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php
index 2f4b4020fa4ede6238749d43871bbd0b22391d4a..e2d242581f846d0a0ef72489f6e74090c979608a 100644
--- a/plugins/ScheduledReports/tests/Integration/ApiTest.php
+++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\ScheduledReports\tests;
 use Piwik\API\Proxy;
 use Piwik\DataTable;
 use Piwik\Date;
-use Piwik\Plugins\API\API;
 use Piwik\Plugins\MobileMessaging\API as APIMobileMessaging;
 use Piwik\Plugins\MobileMessaging\MobileMessaging;
 use Piwik\Plugins\ScheduledReports\API as APIScheduledReports;
diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php
index e69a86bb983cb6926771bc24be4d2906f785a9c2..358f0d2b3e25d83ec91e5924a8efe65d9b103fb5 100644
--- a/plugins/SegmentEditor/API.php
+++ b/plugins/SegmentEditor/API.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\SegmentEditor;
 
 use Exception;
-use Piwik\Cache\Transient as TransientCache;
 use Piwik\Common;
 use Piwik\Date;
 use Piwik\Db;
diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php
index a46be068bc869e6d651314402db0088a906ac7e3..0d7c84ed7a1768a30d8bd741bfc0fe5777c35542 100644
--- a/plugins/SegmentEditor/SegmentEditor.php
+++ b/plugins/SegmentEditor/SegmentEditor.php
@@ -10,8 +10,6 @@ namespace Piwik\Plugins\SegmentEditor;
 
 use Piwik\Config;
 use Piwik\Db;
-use Piwik\DbHelper;
-use Piwik\Version;
 
 /**
  */
diff --git a/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php b/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php
index ca37e0775b9a944d04074fabe4ad92b3fb335b33..206a2e0c7437b3721673c20b88f688f7cc7e064e 100644
--- a/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php
+++ b/plugins/SegmentEditor/tests/Integration/SegmentFormatterTest.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugins\SegmentEditor\tests\Integration;
 use Piwik\Plugins\SegmentEditor\SegmentFormatter;
 use Piwik\Plugins\SegmentEditor\SegmentList;
 use Piwik\Tests\Framework\Fixture;
-use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
 use Piwik\Translate;
 use Exception;
diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php
index 1c09254a334e919a9857c3d78cb1b6a227c4839d..fc7b7eb6e837eece847219a5d3ba1e2d15105a95 100644
--- a/plugins/SitesManager/Controller.php
+++ b/plugins/SitesManager/Controller.php
@@ -13,7 +13,6 @@ use Piwik\API\ResponseBuilder;
 use Piwik\Common;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Piwik;
-use Piwik\Measurable\MeasurableSetting;
 use Piwik\Measurable\MeasurableSettings;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
diff --git a/plugins/SitesManager/tests/Integration/SitesManagerTest.php b/plugins/SitesManager/tests/Integration/SitesManagerTest.php
index 15345fc231969994e220df6bb0d531b40f343090..56763727769fd87de07cedf1ece8535a4ae8f844 100644
--- a/plugins/SitesManager/tests/Integration/SitesManagerTest.php
+++ b/plugins/SitesManager/tests/Integration/SitesManagerTest.php
@@ -8,7 +8,6 @@
 
 namespace Piwik\Plugins\SitesManager\tests\Integration;
 
-use Piwik\Access;
 use Piwik\Cache;
 use Piwik\Archive\ArchiveInvalidator;
 use Piwik\Container\StaticContainer;
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php
index 68c44616233d95ec171b00882ed17792614ff479..1ab38f89ae3b7ca0daed9c6152b00d64d7ea5b51 100644
--- a/plugins/Transitions/API.php
+++ b/plugins/Transitions/API.php
@@ -15,7 +15,6 @@ use Piwik\Common;
 use Piwik\DataAccess\LogAggregator;
 use Piwik\DataArray;
 use Piwik\DataTable;
-use Piwik\DataTable\Manager;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Period;
diff --git a/plugins/UserCountry/Columns/Latitude.php b/plugins/UserCountry/Columns/Latitude.php
index 0e27285f9dab0451cd3756da3e1e4ffaa96a24f6..d768af53f915cc81da68480b406ae0c2b1e1b5cf 100644
--- a/plugins/UserCountry/Columns/Latitude.php
+++ b/plugins/UserCountry/Columns/Latitude.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\UserCountry\Columns;
 
-use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\Segment;
diff --git a/plugins/UserCountry/Columns/Longitude.php b/plugins/UserCountry/Columns/Longitude.php
index 4a93f832233c72e0e01e9f31a328d031fe846e93..e937193dd6b53c4875428a422211f8ea80f15990 100644
--- a/plugins/UserCountry/Columns/Longitude.php
+++ b/plugins/UserCountry/Columns/Longitude.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\UserCountry\Columns;
 
-use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider;
 use Piwik\Plugins\UserCountry\Segment;
diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php
index d0ea7fab1bbcb88e42240dd653fd8ff7c75fdd9e..fd616321ff0ec4db6f8c78a1b19224e00c7049e7 100644
--- a/plugins/UserCountry/UserCountry.php
+++ b/plugins/UserCountry/UserCountry.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\UserCountry;
 
 use Piwik\ArchiveProcessor;
-use Piwik\Common;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Intl\Data\Provider\RegionDataProvider;
diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php
index 830f026edac310edcfbc50cf6992e12f11424442..33a95600bb85a86415d671e576cf5ebc8bbde265 100644
--- a/plugins/UserCountry/functions.php
+++ b/plugins/UserCountry/functions.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Plugins\UserCountry;
 
-use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
 use Piwik\Piwik;
 use Piwik\Plugins\UserCountry\LocationProvider\GeoIp;
diff --git a/plugins/UserCountryMap/UserCountryMap.php b/plugins/UserCountryMap/UserCountryMap.php
index c7819f7f8ce070fcf6dd451ac894acba865be471..bf49c36a636bb1506f489a24c9e0af4ac2f77354 100644
--- a/plugins/UserCountryMap/UserCountryMap.php
+++ b/plugins/UserCountryMap/UserCountryMap.php
@@ -10,7 +10,6 @@ namespace Piwik\Plugins\UserCountryMap;
 
 use Piwik\FrontController;
 use Piwik\Piwik;
-use Piwik\Version;
 use Piwik\WidgetsList;
 use Piwik\Plugin\Manager as PluginManager;
 
diff --git a/plugins/UserLanguage/Reports/Base.php b/plugins/UserLanguage/Reports/Base.php
index 366521b16a8594bdd0199269ac6a50266687fc9f..b6bcc40222ef5515c0b2c6fccd72f9a4506c00a3 100644
--- a/plugins/UserLanguage/Reports/Base.php
+++ b/plugins/UserLanguage/Reports/Base.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\UserLanguage\Reports;
 
-use Piwik\Plugin\ViewDataTable;
 use Piwik\Plugins\CoreVisualizations\Visualizations\Graph;
 
 abstract class Base extends \Piwik\Plugin\Report
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php
index 9e1d9a04f9923a8c942e00e6ec4825fdc9178a26..16ae4c04e73f3f9c8e20434367c9b47856b014a6 100644
--- a/plugins/UsersManager/Controller.php
+++ b/plugins/UsersManager/Controller.php
@@ -9,7 +9,6 @@
 namespace Piwik\Plugins\UsersManager;
 
 use Exception;
-use Piwik\Access;
 use Piwik\API\Request;
 use Piwik\API\ResponseBuilder;
 use Piwik\Common;
diff --git a/plugins/UsersManager/tests/Integration/UserPreferencesTest.php b/plugins/UsersManager/tests/Integration/UserPreferencesTest.php
index cf77f01411755dfbc00cd961a3dd9bbd58a794e1..acc2ffdb8b012e190ec10c974b597a8c59574284 100644
--- a/plugins/UsersManager/tests/Integration/UserPreferencesTest.php
+++ b/plugins/UsersManager/tests/Integration/UserPreferencesTest.php
@@ -12,7 +12,6 @@ use Piwik\Config;
 use Piwik\Piwik;
 use Piwik\Plugins\UsersManager\UserPreferences;
 use Piwik\Plugins\UsersManager\API as APIUsersManager;
-use Piwik\Access;
 use Piwik\Tests\Framework\Fixture;
 use Piwik\Tests\Framework\Mock\FakeAccess;
 use Piwik\Tests\Framework\TestCase\IntegrationTestCase;
diff --git a/plugins/VisitTime/API.php b/plugins/VisitTime/API.php
index e1f90db70eb2d4430dd27634542d7abbdb7b2185..f706860b4e4adeea0163f8b636619a8008de81d0 100644
--- a/plugins/VisitTime/API.php
+++ b/plugins/VisitTime/API.php
@@ -14,7 +14,6 @@ use Piwik\DataTable;
 use Piwik\Date;
 use Piwik\Metrics;
 use Piwik\Period;
-use Piwik\Period\Range;
 use Piwik\Piwik;
 use Piwik\Site;
 
diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php
index 336ee26937fb806e0d93cb2ba7c1753431ce0c4c..bc28ca0ddec94d85b4c401a3ec3d170c4c4848b4 100644
--- a/plugins/VisitsSummary/Controller.php
+++ b/plugins/VisitsSummary/Controller.php
@@ -13,7 +13,6 @@ use Piwik\Common;
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Piwik;
-use Piwik\Plugins\Actions\API as APIActions;
 use Piwik\Site;
 use Piwik\Translation\Translator;
 use Piwik\View;
diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php
index 55696873be61753f41546e8e2eb89592fd00dcf7..665ae17009f10945c92224870372ee55afedf98a 100644
--- a/plugins/VisitsSummary/Reports/Get.php
+++ b/plugins/VisitsSummary/Reports/Get.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Plugins\VisitsSummary\Reports;
 
-use Piwik\DataTable\DataTableInterface;
 use Piwik\Piwik;
 use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit;
 use Piwik\Plugins\CoreHome\Columns\Metrics\AverageTimeOnSite;