[Codingstyle] Disallow unused use statements (#18520)

* Forbid unused use statements

* Fix some incorrect classnames

* fix tests

* remove unused use statements

55 files changed, 0 insertions, 90 deletions

diff --git a/core/Archive/ArchiveInvalidator.php b/core/Archive/ArchiveInvalidator.php
index 1dacecfcbe..0ef586fe8c 100644
--- a/core/Archive/ArchiveInvalidator.php
+++ b/core/Archive/ArchiveInvalidator.php
@@ -30,7 +30,6 @@ use Piwik\Segment;
 use Piwik\SettingsServer;
 use Piwik\Site;
 use Piwik\Tracker\Cache;
-use Piwik\Tracker\Model as TrackerModel;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/core/Archive/DataTableFactory.php b/core/Archive/DataTableFactory.php
index d2c2479448..0725fd1b54 100644
--- a/core/Archive/DataTableFactory.php
+++ b/core/Archive/DataTableFactory.php
@@ -11,7 +11,6 @@ namespace Piwik\Archive;
 
 use Piwik\DataTable;
 use Piwik\DataTable\Row;
-use Piwik\Period;
 use Piwik\Segment;
 use Piwik\Site;
 
diff --git a/core/ArchiveProcessor/ArchivingStatus.php b/core/ArchiveProcessor/ArchivingStatus.php
index 54dfae9dae..5f0bd763b2 100644
--- a/core/ArchiveProcessor/ArchivingStatus.php
+++ b/core/ArchiveProcessor/ArchivingStatus.php
@@ -9,11 +9,9 @@
 
 namespace Piwik\ArchiveProcessor;
 
-use Piwik\Common;
 use Piwik\Concurrency\Lock;
 use Piwik\Concurrency\LockBackend;
 use Piwik\Container\StaticContainer;
-use Piwik\SettingsPiwik;
 
 class ArchivingStatus
 {
diff --git a/core/ArchiveProcessor/Parameters.php b/core/ArchiveProcessor/Parameters.php
index c328170637..4d9975ca9e 100644
--- a/core/ArchiveProcessor/Parameters.php
+++ b/core/ArchiveProcessor/Parameters.php
@@ -9,9 +9,6 @@
 
 namespace Piwik\ArchiveProcessor;
 
-use Piwik\Cache;
-use Piwik\DataAccess\Model;
-use Piwik\DataAccess\RawLogDao;
 use Piwik\Date;
 use Piwik\Log;
 use Piwik\Period;
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 4f0fd85be6..d1ff2e0880 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -9,18 +9,15 @@
 namespace Piwik\ArchiveProcessor;
 
 use Exception;
-use Piwik\Common;
 use Piwik\Config;
 use Piwik\Config\GeneralConfig;
 use Piwik\DataAccess\ArchiveWriter;
-use Piwik\DataAccess\Model;
 use Piwik\Date;
 use Piwik\Log;
 use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
 use Piwik\Plugins\CoreAdminHome\Controller;
-use Piwik\Scheduler\Task;
 use Piwik\Segment;
 use Piwik\SettingsPiwik;
 use Piwik\SettingsServer;
diff --git a/core/AssetManager/UIAsset.php b/core/AssetManager/UIAsset.php
index cc26ba9564..012d5ab1ea 100644
--- a/core/AssetManager/UIAsset.php
+++ b/core/AssetManager/UIAsset.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\AssetManager;
 
-use Exception;
 
 abstract class UIAsset
 {
diff --git a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
index 5a31a25505..4248db9393 100644
--- a/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
+++ b/core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php
@@ -9,7 +9,6 @@
 namespace Piwik\AssetManager\UIAssetFetcher;
 
 use Piwik\AssetManager\UIAssetFetcher;
-use Piwik\Development;
 use Piwik\Piwik;
 
 class JScriptUIAssetFetcher extends UIAssetFetcher
diff --git a/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php b/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
index d56283bbaa..6834d2923f 100644
--- a/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
+++ b/core/AssetManager/UIAssetFetcher/PluginUmdAssetFetcher.php
@@ -12,7 +12,6 @@ namespace Piwik\AssetManager\UIAssetFetcher;
 use Piwik\AssetManager\UIAssetFetcher;
 use Piwik\Config;
 use Piwik\Development;
-use Piwik\Exception\Exception;
 use Piwik\Plugin\Manager;
 
 class PluginUmdAssetFetcher extends UIAssetFetcher
diff --git a/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php b/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php
index cca95ef384..68004330e7 100644
--- a/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php
+++ b/core/AssetManager/UIAssetFetcher/StylesheetUIAssetFetcher.php
@@ -9,7 +9,6 @@
 namespace Piwik\AssetManager\UIAssetFetcher;
 
 use Piwik\AssetManager\UIAssetFetcher;
-use Piwik\Development;
 use Piwik\Piwik;
 
 class StylesheetUIAssetFetcher extends UIAssetFetcher
diff --git a/core/Changes/Model.php b/core/Changes/Model.php
index a9b46ad7a3..0988ca96d3 100644
--- a/core/Changes/Model.php
+++ b/core/Changes/Model.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\Changes;
 
-use Piwik\Exception\Exception;
 use Piwik\Piwik;
 use Piwik\Common;
 use Piwik\Date;
diff --git a/core/CliMulti/Output.php b/core/CliMulti/Output.php
index eced3854af..84fbaefb9f 100644
--- a/core/CliMulti/Output.php
+++ b/core/CliMulti/Output.php
@@ -8,7 +8,6 @@
 namespace Piwik\CliMulti;
 
 use Piwik\CliMulti;
-use Piwik\Common;
 use Piwik\Filesystem;
 
 class Output implements OutputInterface
diff --git a/core/CliMulti/OutputInterface.php b/core/CliMulti/OutputInterface.php
index 33d1978797..8eead52bd0 100644
--- a/core/CliMulti/OutputInterface.php
+++ b/core/CliMulti/OutputInterface.php
@@ -7,9 +7,6 @@
  */
 namespace Piwik\CliMulti;
 
-use Piwik\CliMulti;
-use Piwik\Common;
-use Piwik\Filesystem;
 
 interface OutputInterface
 {
diff --git a/core/CliMulti/StaticOutput.php b/core/CliMulti/StaticOutput.php
index d298cc7bca..8c2291db64 100644
--- a/core/CliMulti/StaticOutput.php
+++ b/core/CliMulti/StaticOutput.php
@@ -7,9 +7,7 @@
  */
 namespace Piwik\CliMulti;
 
-use Piwik\CliMulti;
 use Piwik\Common;
-use Piwik\Filesystem;
 
 class StaticOutput implements OutputInterface
 {
diff --git a/core/Columns/Dimension.php b/core/Columns/Dimension.php
index c4ad3d9c8d..0875e1e753 100644
--- a/core/Columns/Dimension.php
+++ b/core/Columns/Dimension.php
@@ -12,7 +12,6 @@ use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugin;
 use Piwik\Plugin\ArchivedMetric;
-use Piwik\Plugin\ComponentFactory;
 use Piwik\Plugin\Segment;
 use Exception;
 use Piwik\CacheId;
diff --git a/core/Columns/Discriminator.php b/core/Columns/Discriminator.php
index 7f85684986..98a85d20ac 100644
--- a/core/Columns/Discriminator.php
+++ b/core/Columns/Discriminator.php
@@ -9,7 +9,6 @@
 namespace Piwik\Columns;
 
 use Exception;
-use Piwik\Plugins\Actions\Actions\ActionSiteSearch;
 
 /**
  * @api
diff --git a/core/Common.php b/core/Common.php
index 9a8d45d6b7..44d9e2cfdf 100644
--- a/core/Common.php
+++ b/core/Common.php
@@ -13,7 +13,6 @@ use Piwik\CliMulti\Process;
 use Piwik\Container\StaticContainer;
 use Piwik\Intl\Data\Provider\LanguageDataProvider;
 use Piwik\Intl\Data\Provider\RegionDataProvider;
-use Piwik\Plugins\UserCountry\LocationProvider\DefaultProvider;
 use Piwik\Tracker\Cache as TrackerCache;
 
 /**
diff --git a/core/CronArchive.php b/core/CronArchive.php
index dcde1460fc..de55cddcc0 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -23,8 +23,6 @@ use Piwik\CronArchive\QueueConsumer;
 use Piwik\CronArchive\SharedSiteIds;
 use Piwik\CronArchive\StopArchiverException;
 use Piwik\DataAccess\ArchiveSelector;
-use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\DataAccess\ArchiveWriter;
 use Piwik\DataAccess\Model;
 use Piwik\DataAccess\RawLogDao;
 use Piwik\Exception\UnexpectedWebsiteFoundException;
diff --git a/core/CronArchive/QueueConsumer.php b/core/CronArchive/QueueConsumer.php
index 2f4902e588..7e920fa6bc 100644
--- a/core/CronArchive/QueueConsumer.php
+++ b/core/CronArchive/QueueConsumer.php
@@ -14,18 +14,14 @@ use Piwik\ArchiveProcessor\Loader;
 use Piwik\ArchiveProcessor\Parameters;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\CliMulti\RequestParser;
-use Piwik\Common;
 use Piwik\CronArchive;
 use Piwik\DataAccess\ArchiveSelector;
 use Piwik\DataAccess\Model;
 use Piwik\Date;
-use Piwik\Db;
-use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Period;
 use Piwik\Period\Factory as PeriodFactory;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager;
-use Piwik\Plugins\SitesManager\API;
 use Piwik\Segment;
 use Piwik\Site;
 use Piwik\Timer;
diff --git a/core/CronArchive/SegmentArchiving.php b/core/CronArchive/SegmentArchiving.php
index 1464eeb295..f7dc4636e9 100644
--- a/core/CronArchive/SegmentArchiving.php
+++ b/core/CronArchive/SegmentArchiving.php
@@ -14,7 +14,6 @@ use Piwik\Archive\ArchiveInvalidator;
 use Piwik\ArchiveProcessor\Rules;
 use Piwik\Common;
 use Piwik\Container\StaticContainer;
-use Piwik\CronArchive;
 use Piwik\Date;
 use Piwik\Db;
 use Piwik\Period\Range;
diff --git a/core/DataAccess/ArchiveSelector.php b/core/DataAccess/ArchiveSelector.php
index c0a19a6033..721163804a 100644
--- a/core/DataAccess/ArchiveSelector.php
+++ b/core/DataAccess/ArchiveSelector.php
@@ -20,7 +20,6 @@ use Piwik\Db;
 use Piwik\Period;
 use Piwik\Period\Range;
 use Piwik\Segment;
-use Piwik\SettingsServer;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/core/DataTable.php b/core/DataTable.php
index 8b9291a78e..62ebc6db18 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -11,7 +11,6 @@ namespace Piwik;
 
 use Closure;
 use Exception;
-use Piwik\Archive\DataTableFactory;
 use Piwik\DataTable\DataTableInterface;
 use Piwik\DataTable\Manager;
 use Piwik\DataTable\Renderer\Html;
diff --git a/core/DataTable/Map.php b/core/DataTable/Map.php
index 8700d8822d..351cb4d058 100644
--- a/core/DataTable/Map.php
+++ b/core/DataTable/Map.php
@@ -11,7 +11,6 @@ namespace Piwik\DataTable;
 use Closure;
 use Piwik\Common;
 use Piwik\DataTable;
-use Piwik\DataTable\Renderer\Console;
 use Piwik\DataTable\Renderer\Html;
 
 /**
diff --git a/core/DataTable/Row.php b/core/DataTable/Row.php
index 731ad4f977..878c1a61cf 100644
--- a/core/DataTable/Row.php
+++ b/core/DataTable/Row.php
@@ -12,7 +12,6 @@ use Exception;
 use Piwik\Container\StaticContainer;
 use Piwik\DataTable;
 use Piwik\Date;
-use Piwik\Log;
 use Piwik\Metrics;
 use Piwik\Period;
 use Psr\Log\LoggerInterface;
diff --git a/core/Db.php b/core/Db.php
index d3df9003ed..b047d1d8fd 100644
--- a/core/Db.php
+++ b/core/Db.php
@@ -9,7 +9,6 @@
 namespace Piwik;
 
 use Exception;
-use Piwik\DataAccess\TableMetadata;
 use Piwik\Db\Adapter;
 
 /**
diff --git a/core/DeviceDetector/DeviceDetectorFactory.php b/core/DeviceDetector/DeviceDetectorFactory.php
index 83931aaa1c..bc81a74a57 100644
--- a/core/DeviceDetector/DeviceDetectorFactory.php
+++ b/core/DeviceDetector/DeviceDetectorFactory.php
@@ -9,7 +9,6 @@
 namespace Piwik\DeviceDetector;
 
 use DeviceDetector\DeviceDetector;
-use Piwik\Common;
 use Piwik\Container\StaticContainer;
 
 class DeviceDetectorFactory
diff --git a/core/Exception/NotYetInstalledException.php b/core/Exception/NotYetInstalledException.php
index c1635f5056..a8ebbb7d8a 100644
--- a/core/Exception/NotYetInstalledException.php
+++ b/core/Exception/NotYetInstalledException.php
@@ -8,8 +8,6 @@
  */
 namespace Piwik\Exception;
 
-use Piwik\Common;
-use Piwik\Url;
 use Throwable;
 
 class NotYetInstalledException extends InvalidRequestParameterException
diff --git a/core/Http/ControllerResolver.php b/core/Http/ControllerResolver.php
index 82b2891327..b518b38a05 100644
--- a/core/Http/ControllerResolver.php
+++ b/core/Http/ControllerResolver.php
@@ -10,7 +10,6 @@ namespace Piwik\Http;
 
 use DI\FactoryInterface;
 use Exception;
-use Piwik\Plugin\Controller;
 use Piwik\Plugin\ReportsProvider;
 use Piwik\Plugin\WidgetsProvider;
 
diff --git a/core/Mail/Transport.php b/core/Mail/Transport.php
index edf6b13755..e88440b0ae 100644
--- a/core/Mail/Transport.php
+++ b/core/Mail/Transport.php
@@ -15,7 +15,6 @@ use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Mail;
 use Piwik\Piwik;
-use Piwik\Version;
 
 class Transport
 {
diff --git a/core/Metrics.php b/core/Metrics.php
index 7cb3f26b86..cde226b608 100644
--- a/core/Metrics.php
+++ b/core/Metrics.php
@@ -9,7 +9,6 @@
 namespace Piwik;
 
 use Piwik\Cache as PiwikCache;
-use Piwik\Container\StaticContainer;
 
 require_once PIWIK_INCLUDE_PATH . "/core/Piwik.php";
 
diff --git a/core/Plugin/Manager.php b/core/Plugin/Manager.php
index a3339f027d..61538b596d 100644
--- a/core/Plugin/Manager.php
+++ b/core/Plugin/Manager.php
@@ -16,7 +16,6 @@ use Piwik\Common;
 use Piwik\Config;
 use Piwik\Config as PiwikConfig;
 use Piwik\Container\StaticContainer;
-use Piwik\Date;
 use Piwik\Development;
 use Piwik\EventDispatcher;
 use Piwik\Exception\PluginDeactivatedException;
diff --git a/core/Plugin/MetadataLoader.php b/core/Plugin/MetadataLoader.php
index a6fb420255..df478d5432 100644
--- a/core/Plugin/MetadataLoader.php
+++ b/core/Plugin/MetadataLoader.php
@@ -11,7 +11,6 @@ namespace Piwik\Plugin;
 use Exception;
 use Piwik\Piwik;
 use Piwik\Version;
-use Piwik\Plugin;
 
 /**
  * @see core/Version.php
diff --git a/core/ReportRenderer/Html.php b/core/ReportRenderer/Html.php
index ef3029cf6a..71b77c00dc 100644
--- a/core/ReportRenderer/Html.php
+++ b/core/ReportRenderer/Html.php
@@ -8,7 +8,6 @@
  */
 namespace Piwik\ReportRenderer;
 
-use Piwik\Mail;
 use Piwik\Piwik;
 use Piwik\ReportRenderer;
 use Piwik\View;
diff --git a/core/ReportRenderer/Pdf.php b/core/ReportRenderer/Pdf.php
index d7ac33c9fb..2ec74f4739 100644
--- a/core/ReportRenderer/Pdf.php
+++ b/core/ReportRenderer/Pdf.php
@@ -12,7 +12,6 @@ use Piwik\Common;
 use Piwik\Filesystem;
 use Piwik\NumberFormatter;
 use Piwik\Piwik;
-use Piwik\Plugins\API\API;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\ReportRenderer;
 use Piwik\TCPDF;
diff --git a/core/Session/SessionAuth.php b/core/Session/SessionAuth.php
index bff91c113e..0f2d1cadad 100644
--- a/core/Session/SessionAuth.php
+++ b/core/Session/SessionAuth.php
@@ -11,11 +11,9 @@ namespace Piwik\Session;
 
 use Piwik\Auth;
 use Piwik\AuthResult;
-use Piwik\Common;
 use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Date;
-use Piwik\Plugins\UsersManager\Model;
 use Piwik\Plugins\UsersManager\Model as UsersModel;
 use Piwik\Session;
 use Psr\Log\LoggerInterface;
diff --git a/core/Session/SessionFingerprint.php b/core/Session/SessionFingerprint.php
index 231ba17ea6..fa6a4fd22c 100644
--- a/core/Session/SessionFingerprint.php
+++ b/core/Session/SessionFingerprint.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Session;
 
-use Piwik\Common;
 use Piwik\Config;
 use Piwik\Date;
 
diff --git a/core/SupportedBrowser.php b/core/SupportedBrowser.php
index 6f9abe6310..3f9f195df0 100644
--- a/core/SupportedBrowser.php
+++ b/core/SupportedBrowser.php
@@ -9,7 +9,6 @@
 
 namespace Piwik;
 
-use Piwik\Http;
 use Piwik\Piwik;
 use Piwik\Container\StaticContainer;
 use Piwik\DeviceDetector\DeviceDetectorFactory;
diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php
index 4cce6e4131..67ab93b71d 100644
--- a/core/Tracker/Cache.php
+++ b/core/Tracker/Cache.php
@@ -17,7 +17,6 @@ use Piwik\Option;
 use Piwik\Piwik;
 use Piwik\Tracker;
 use Psr\Log\LoggerInterface;
-use function DI\object;
 
 /**
  * Simple cache mechanism used in Tracker to avoid requesting settings from mysql on every request
diff --git a/core/Tracker/Db/Pdo/Mysql.php b/core/Tracker/Db/Pdo/Mysql.php
index 1e83b7135a..8b1a536704 100644
--- a/core/Tracker/Db/Pdo/Mysql.php
+++ b/core/Tracker/Db/Pdo/Mysql.php
@@ -12,7 +12,6 @@ use Exception;
 use PDO;
 use PDOException;
 use PDOStatement;
-use Piwik\Config;
 use Piwik\Tracker\Db;
 use Piwik\Tracker\Db\DbException;
 
diff --git a/core/Tracker/FingerprintSalt.php b/core/Tracker/FingerprintSalt.php
index 9896c074ca..c3d056ba74 100644
--- a/core/Tracker/FingerprintSalt.php
+++ b/core/Tracker/FingerprintSalt.php
@@ -11,13 +11,7 @@ namespace Piwik\Tracker;
 
 use Piwik\Common;
 use Piwik\Date;
-use Piwik\Exception\InvalidRequestParameterException;
-use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\Option;
-use Piwik\Piwik;
-use Piwik\SettingsServer;
-use Piwik\Site;
-use Piwik\Db as PiwikDb;
 
 class FingerprintSalt
 {
diff --git a/core/Tracker/GoalManager.php b/core/Tracker/GoalManager.php
index 1d1e3314d1..5c458c28ba 100644
--- a/core/Tracker/GoalManager.php
+++ b/core/Tracker/GoalManager.php
@@ -19,7 +19,6 @@ use Piwik\Plugin\Dimension\VisitDimension;
 use Piwik\Plugin\Manager;
 use Piwik\Plugins\CustomVariables\CustomVariables;
 use Piwik\Plugins\Events\Actions\ActionEvent;
-use Piwik\Tracker;
 use Piwik\Tracker\Visit\VisitProperties;
 
 /**
diff --git a/core/Tracker/Request.php b/core/Tracker/Request.php
index 2dd8be5579..58911a25a5 100644
--- a/core/Tracker/Request.php
+++ b/core/Tracker/Request.php
@@ -10,7 +10,6 @@ namespace Piwik\Tracker;
 
 use Exception;
 use Piwik\Common;
-use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\Cookie;
 use Piwik\Exception\InvalidRequestParameterException;
@@ -18,7 +17,6 @@ use Piwik\Exception\UnexpectedWebsiteFoundException;
 use Piwik\IP;
 use Matomo\Network\IPUtils;
 use Piwik\Piwik;
-use Piwik\Plugins\PrivacyManager\PrivacyManager;
 use Piwik\Plugins\UsersManager\UsersManager;
 use Piwik\ProxyHttp;
 use Piwik\Segment\SegmentExpression;
diff --git a/core/Updater/Migration/Custom.php b/core/Updater/Migration/Custom.php
index c69dca9fd6..3e4e92bea5 100644
--- a/core/Updater/Migration/Custom.php
+++ b/core/Updater/Migration/Custom.php
@@ -7,8 +7,6 @@
  */
 namespace Piwik\Updater\Migration;
 
-use Piwik\Config;
-use Piwik\Container\StaticContainer;
 use Piwik\Updater\Migration;
 
 /**
diff --git a/core/Updater/Migration/Db/DropColumns.php b/core/Updater/Migration/Db/DropColumns.php
index 5df61ddf08..f71c179694 100644
--- a/core/Updater/Migration/Db/DropColumns.php
+++ b/core/Updater/Migration/Db/DropColumns.php
@@ -7,7 +7,6 @@
  */
 namespace Piwik\Updater\Migration\Db;
 
-use Piwik\Db;
 use Piwik\DbHelper;
 
 /**
diff --git a/core/Updates/4.0.0-b1.php b/core/Updates/4.0.0-b1.php
index 13c7bdd868..1aaa6cfee1 100644
--- a/core/Updates/4.0.0-b1.php
+++ b/core/Updates/4.0.0-b1.php
@@ -25,7 +25,6 @@ use Piwik\Plugins\PagePerformance\Columns\TimeNetwork;
 use Piwik\Plugins\PagePerformance\Columns\TimeOnLoad;
 use Piwik\Plugins\PagePerformance\Columns\TimeServer;
 use Piwik\Plugins\PagePerformance\Columns\TimeTransfer;
-use Piwik\Plugins\UsersManager\Model;
 use Piwik\Common;
 use Piwik\Config;
 use Piwik\Plugins\UserCountry\LocationProvider;
diff --git a/core/Updates/4.0.0-rc3.php b/core/Updates/4.0.0-rc3.php
index 86c9ca0189..cda763e666 100644
--- a/core/Updates/4.0.0-rc3.php
+++ b/core/Updates/4.0.0-rc3.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Config;
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
diff --git a/core/Updates/4.0.0-rc4.php b/core/Updates/4.0.0-rc4.php
index ad408f1ed4..2315f491cc 100644
--- a/core/Updates/4.0.0-rc4.php
+++ b/core/Updates/4.0.0-rc4.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Config;
 use Piwik\Container\StaticContainer;
 use Piwik\DataAccess\ArchiveTableCreator;
 use Piwik\Date;
diff --git a/core/Updates/4.0.1-b1.php b/core/Updates/4.0.1-b1.php
index 852b3b934b..c3b4d503d7 100644
--- a/core/Updates/4.0.1-b1.php
+++ b/core/Updates/4.0.1-b1.php
@@ -10,12 +10,6 @@
 namespace Piwik\Updates;
 
 use Piwik\Common;
-use Piwik\Config;
-use Piwik\Container\StaticContainer;
-use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\Date;
-use Piwik\DbHelper;
-use Piwik\Plugin\ReleaseChannels;
 use Piwik\SettingsPiwik;
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
diff --git a/core/Updates/4.1.2-b2.php b/core/Updates/4.1.2-b2.php
index 0c38c38480..bbabf2ca99 100644
--- a/core/Updates/4.1.2-b2.php
+++ b/core/Updates/4.1.2-b2.php
@@ -9,13 +9,7 @@
 
 namespace Piwik\Updates;
 
-use Piwik\Container\StaticContainer;
-use Piwik\CronArchive;
 use Piwik\DataAccess\ArchiveTableCreator;
-use Piwik\Date;
-use Piwik\Plugins\SegmentEditor\API;
-use Piwik\Archive\ArchiveInvalidator;
-use Piwik\ArchiveProcessor\Rules;
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
diff --git a/core/Updates/4.3.0-b3.php b/core/Updates/4.3.0-b3.php
index d9588f1d3f..14a79f575c 100644
--- a/core/Updates/4.3.0-b3.php
+++ b/core/Updates/4.3.0-b3.php
@@ -11,10 +11,7 @@ namespace Piwik\Updates;
 
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
-use Piwik\Updater\Migration;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
-use Piwik\Db;
-use Piwik\Common;
 
 /**
  * Update for version 4.3.0-b3.
diff --git a/core/Updates/4.3.0-b4.php b/core/Updates/4.3.0-b4.php
index de579b9c1e..f0ced8b9eb 100644
--- a/core/Updates/4.3.0-b4.php
+++ b/core/Updates/4.3.0-b4.php
@@ -11,7 +11,6 @@ namespace Piwik\Updates;
 
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
-use Piwik\Updater\Migration;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
 use Piwik\Db;
 use Piwik\Common;
diff --git a/core/Updates/4.3.0-rc2.php b/core/Updates/4.3.0-rc2.php
index 9246997727..09ad6f2f23 100644
--- a/core/Updates/4.3.0-rc2.php
+++ b/core/Updates/4.3.0-rc2.php
@@ -11,10 +11,7 @@ namespace Piwik\Updates;
 
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
-use Piwik\Updater\Migration;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
-use Piwik\Db;
-use Piwik\Common;
 
 /**
  * Update for version 4.3.0-rc2.
diff --git a/core/Updates/4.5.0-b1.php b/core/Updates/4.5.0-b1.php
index 1ac0cae445..3cd30ac854 100644
--- a/core/Updates/4.5.0-b1.php
+++ b/core/Updates/4.5.0-b1.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Updates;
 
-use Piwik\DbHelper;
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
diff --git a/core/Updates/4.6.0-b1.php b/core/Updates/4.6.0-b1.php
index 557ed9b953..d48a72ea42 100644
--- a/core/Updates/4.6.0-b1.php
+++ b/core/Updates/4.6.0-b1.php
@@ -11,7 +11,6 @@ namespace Piwik\Updates;
 
 use Piwik\Updater;
 use Piwik\Updates as PiwikUpdates;
-use Piwik\Updater\Migration;
 use Piwik\Updater\Migration\Factory as MigrationFactory;
 
 class Updates_4_6_0_b1 extends PiwikUpdates
diff --git a/core/Validators/CharacterLength.php b/core/Validators/CharacterLength.php
index d40b11bfcb..6e235bf081 100644
--- a/core/Validators/CharacterLength.php
+++ b/core/Validators/CharacterLength.php
@@ -9,7 +9,6 @@
 
 namespace Piwik\Validators;
 
-use Piwik\Common;
 use Piwik\Piwik;
 
 class CharacterLength extends BaseValidator
diff --git a/core/View/HtmlReportEmailHeaderView.php b/core/View/HtmlReportEmailHeaderView.php
index 2320146e52..bfbbfaaadd 100644
--- a/core/View/HtmlReportEmailHeaderView.php
+++ b/core/View/HtmlReportEmailHeaderView.php
@@ -13,7 +13,6 @@ use Piwik\Common;
 use Piwik\Date;
 use Piwik\Mail\EmailStyles;
 use Piwik\Plugin\ThemeStyles;
-use Piwik\Plugins\API\API;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Scheduler\Schedule\Schedule;
 use Piwik\SettingsPiwik;