From d3d045dd5c5af5f29268727afe63f3c53d22af6c Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 14 Feb 2018 16:55:43 +0100
Subject: [PATCH] Remove unused import statements

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
---
 apps/comments/lib/Activity/Listener.php                      | 1 -
 apps/comments/lib/EventHandler.php                           | 1 -
 apps/dav/lib/CalDAV/CalDavBackend.php                        | 2 --
 apps/dav/lib/CalDAV/Plugin.php                               | 2 --
 apps/dav/lib/CalDAV/Principal/Collection.php                 | 1 -
 apps/dav/lib/CalDAV/Schedule/IMipPlugin.php                  | 1 -
 apps/dav/lib/CardDAV/CardDavBackend.php                      | 1 -
 apps/dav/lib/CardDAV/ImageExportPlugin.php                   | 1 -
 apps/dav/lib/CardDAV/Plugin.php                              | 1 -
 apps/dav/lib/Connector/LegacyDAVACL.php                      | 1 -
 apps/dav/lib/Connector/Sabre/ObjectTree.php                  | 1 -
 apps/dav/lib/Connector/Sabre/Principal.php                   | 1 -
 apps/dav/lib/Connector/Sabre/QuotaPlugin.php                 | 3 ---
 apps/dav/lib/Connector/Sabre/ServerFactory.php               | 1 -
 apps/dav/lib/DAV/SystemPrincipalBackend.php                  | 1 -
 apps/dav/lib/Files/FilesHome.php                             | 1 -
 apps/dav/lib/Files/RootCollection.php                        | 1 -
 apps/dav/lib/Server.php                                      | 2 --
 apps/dav/lib/Upload/ChunkingPlugin.php                       | 2 --
 apps/encryption/lib/AppInfo/Application.php                  | 1 -
 apps/encryption/lib/Hooks/UserHooks.php                      | 1 -
 apps/federation/lib/BackgroundJob/GetSharedSecret.php        | 1 -
 apps/federation/lib/BackgroundJob/RequestSharedSecret.php    | 1 -
 apps/federation/lib/SyncJob.php                              | 1 -
 apps/files_external/lib/AppInfo/Application.php              | 1 -
 apps/files_external/lib/Controller/AjaxController.php        | 2 --
 apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php     | 1 -
 .../lib/Lib/Auth/Password/LoginCredentials.php               | 3 ---
 apps/files_external/lib/Lib/Auth/Password/UserProvided.php   | 1 -
 apps/files_external/lib/Lib/Backend/AmazonS3.php             | 4 ----
 apps/files_external/lib/Lib/Backend/DAV.php                  | 3 ---
 apps/files_external/lib/Lib/Backend/FTP.php                  | 3 ---
 apps/files_external/lib/Lib/Backend/LegacyBackend.php        | 1 -
 apps/files_external/lib/Lib/Backend/Local.php                | 1 -
 apps/files_external/lib/Lib/Backend/OwnCloud.php             | 3 ---
 apps/files_external/lib/Lib/Backend/SFTP_Key.php             | 3 ---
 apps/files_external/lib/Lib/Backend/SMB.php                  | 2 --
 apps/files_external/lib/Lib/Backend/SMB_OC.php               | 2 --
 apps/files_external/lib/Lib/Backend/Swift.php                | 2 --
 apps/files_external/lib/Lib/DependencyTrait.php              | 2 --
 apps/files_external/lib/Lib/FrontendDefinitionTrait.php      | 2 --
 .../files_external/lib/Lib/LegacyDependencyCheckPolyfill.php | 1 -
 apps/files_external/lib/Lib/SessionStorageWrapper.php        | 1 -
 apps/files_external/lib/Lib/Storage/Swift.php                | 1 -
 apps/files_external/lib/Lib/StorageModifierTrait.php         | 2 --
 apps/files_external/lib/Migration/StorageMigrator.php        | 1 -
 apps/files_external/lib/Service/UserStoragesService.php      | 2 --
 apps/files_external/lib/Settings/Personal.php                | 1 -
 apps/files_sharing/lib/Controller/ShareController.php        | 1 -
 apps/files_sharing/lib/Controller/ShareInfoController.php    | 1 -
 apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php    | 1 -
 apps/sharebymail/templates/settings-admin.php                | 1 -
 apps/systemtags/lib/Activity/Listener.php                    | 1 -
 apps/theming/lib/Controller/ThemingController.php            | 2 --
 apps/theming/lib/Util.php                                    | 1 -
 apps/user_ldap/lib/Controller/RenewPasswordController.php    | 1 -
 apps/user_ldap/lib/Jobs/Sync.php                             | 2 --
 apps/user_ldap/lib/Notification/Notifier.php                 | 2 --
 core/Command/Group/AddUser.php                               | 2 --
 core/Command/Group/ListCommand.php                           | 3 ---
 core/Command/Group/RemoveUser.php                            | 2 --
 core/Command/Maintenance/UpdateHtaccess.php                  | 4 ----
 core/Command/Security/ImportCertificate.php                  | 3 ---
 core/Command/Security/ListCertificates.php                   | 2 --
 core/Command/Security/RemoveCertificate.php                  | 3 ---
 core/Command/TwoFactorAuth/Base.php                          | 1 -
 core/Command/Upgrade.php                                     | 1 -
 core/Command/User/Disable.php                                | 1 -
 core/Command/User/Enable.php                                 | 1 -
 core/Command/User/Info.php                                   | 2 --
 core/Command/User/ListCommand.php                            | 1 -
 core/Controller/AvatarController.php                         | 1 -
 .../Middleware/Security/BruteForceMiddleware.php             | 1 -
 .../Middleware/Security/RateLimitingMiddleware.php           | 1 -
 lib/private/Contacts/ContactsMenu/ContactsStore.php          | 2 --
 lib/private/DB/MigrationService.php                          | 2 --
 lib/private/DB/SchemaWrapper.php                             | 1 -
 lib/private/Files/Config/UserMountCache.php                  | 1 -
 lib/private/Files/ObjectStore/S3ObjectTrait.php              | 3 ---
 lib/private/Installer.php                                    | 5 -----
 lib/private/Repair.php                                       | 2 --
 lib/private/Share/Share.php                                  | 5 -----
 lib/private/Share20/DefaultShareProvider.php                 | 1 -
 lib/private/User/Session.php                                 | 1 -
 lib/public/Util.php                                          | 1 -
 settings/Controller/CheckSetupController.php                 | 1 -
 settings/Controller/LogSettingsController.php                | 5 -----
 87 files changed, 147 deletions(-)

diff --git a/apps/comments/lib/Activity/Listener.php b/apps/comments/lib/Activity/Listener.php
index 1dec28c825..e9a41f8f6b 100644
--- a/apps/comments/lib/Activity/Listener.php
+++ b/apps/comments/lib/Activity/Listener.php
@@ -31,7 +31,6 @@ use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\IUser;
 use OCP\IUserSession;
-use OCP\Share;
 use OCP\Share\IShareHelper;
 
 class Listener {
diff --git a/apps/comments/lib/EventHandler.php b/apps/comments/lib/EventHandler.php
index 0fc6de7bf4..d2b31e809c 100644
--- a/apps/comments/lib/EventHandler.php
+++ b/apps/comments/lib/EventHandler.php
@@ -24,7 +24,6 @@
 namespace OCA\Comments;
 
 use OCA\Comments\Activity\Listener as ActivityListener;
-use OCA\Comments\AppInfo\Application;
 use OCA\Comments\Notification\Listener as NotificationListener;
 use OCP\Comments\CommentsEvent;
 use OCP\Comments\ICommentsEventHandler;
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index a936cb6aeb..290d602700 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -51,10 +51,8 @@ use Sabre\DAV;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\Exception\NotFound;
 use Sabre\DAV\PropPatch;
-use Sabre\HTTP\URLUtil;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
-use Sabre\VObject\Component\VEvent;
 use Sabre\VObject\Component\VTimeZone;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
diff --git a/apps/dav/lib/CalDAV/Plugin.php b/apps/dav/lib/CalDAV/Plugin.php
index 0d793f929b..4aa9762899 100644
--- a/apps/dav/lib/CalDAV/Plugin.php
+++ b/apps/dav/lib/CalDAV/Plugin.php
@@ -23,8 +23,6 @@
 
 namespace OCA\DAV\CalDAV;
 
-use Sabre\HTTP\URLUtil;
-
 class Plugin extends \Sabre\CalDAV\Plugin {
 
 	/**
diff --git a/apps/dav/lib/CalDAV/Principal/Collection.php b/apps/dav/lib/CalDAV/Principal/Collection.php
index cadfc66c26..e4389a1c72 100644
--- a/apps/dav/lib/CalDAV/Principal/Collection.php
+++ b/apps/dav/lib/CalDAV/Principal/Collection.php
@@ -23,7 +23,6 @@
 
 namespace OCA\DAV\CalDAV\Principal;
 
-use OCA\DAV\CalDAV\Principal\User;
 
 /**
  * Class Collection
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
index 781baa2032..85973a8be1 100644
--- a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -35,7 +35,6 @@ use OCP\L10N\IFactory as L10NFactory;
 use OCP\Mail\IEMailTemplate;
 use OCP\Mail\IMailer;
 use Sabre\CalDAV\Schedule\IMipPlugin as SabreIMipPlugin;
-use Sabre\DAV\Xml\Element\Prop;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VEvent;
 use Sabre\VObject\DateTimeParser;
diff --git a/apps/dav/lib/CardDAV/CardDavBackend.php b/apps/dav/lib/CardDAV/CardDavBackend.php
index be92f16f77..a2d3b03147 100644
--- a/apps/dav/lib/CardDAV/CardDavBackend.php
+++ b/apps/dav/lib/CardDAV/CardDavBackend.php
@@ -46,7 +46,6 @@ use Sabre\CardDAV\Backend\BackendInterface;
 use Sabre\CardDAV\Backend\SyncSupport;
 use Sabre\CardDAV\Plugin;
 use Sabre\DAV\Exception\BadRequest;
-use Sabre\HTTP\URLUtil;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Reader;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php
index 069239326b..cac8e79574 100644
--- a/apps/dav/lib/CardDAV/ImageExportPlugin.php
+++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php
@@ -24,7 +24,6 @@
 namespace OCA\DAV\CardDAV;
 
 use OCP\Files\NotFoundException;
-use OCP\ILogger;
 use Sabre\CardDAV\Card;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
diff --git a/apps/dav/lib/CardDAV/Plugin.php b/apps/dav/lib/CardDAV/Plugin.php
index 2dca3585f3..cd303a394e 100644
--- a/apps/dav/lib/CardDAV/Plugin.php
+++ b/apps/dav/lib/CardDAV/Plugin.php
@@ -27,7 +27,6 @@ use OCA\DAV\CardDAV\Xml\Groups;
 use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
 use Sabre\DAV\Server;
-use Sabre\HTTP\URLUtil;
 
 class Plugin extends \Sabre\CardDAV\Plugin {
 
diff --git a/apps/dav/lib/Connector/LegacyDAVACL.php b/apps/dav/lib/Connector/LegacyDAVACL.php
index f96d75a248..6c55eb0765 100644
--- a/apps/dav/lib/Connector/LegacyDAVACL.php
+++ b/apps/dav/lib/Connector/LegacyDAVACL.php
@@ -28,7 +28,6 @@ namespace OCA\DAV\Connector;
 use OCA\DAV\Connector\Sabre\DavAclPlugin;
 use Sabre\DAV\INode;
 use Sabre\DAV\PropFind;
-use Sabre\HTTP\URLUtil;
 use Sabre\DAVACL\Xml\Property\Principal;
 
 class LegacyDAVACL extends DavAclPlugin {
diff --git a/apps/dav/lib/Connector/Sabre/ObjectTree.php b/apps/dav/lib/Connector/Sabre/ObjectTree.php
index 25db1d5028..15988cdadb 100644
--- a/apps/dav/lib/Connector/Sabre/ObjectTree.php
+++ b/apps/dav/lib/Connector/Sabre/ObjectTree.php
@@ -34,7 +34,6 @@ use OCA\DAV\Connector\Sabre\Exception\Forbidden;
 use OCA\DAV\Connector\Sabre\Exception\InvalidPath;
 use OCA\DAV\Connector\Sabre\Exception\FileLocked;
 use OC\Files\FileInfo;
-use OC\Files\Mount\MoveableMount;
 use OCP\Files\ForbiddenException;
 use OCP\Files\StorageInvalidException;
 use OCP\Files\StorageNotAvailableException;
diff --git a/apps/dav/lib/Connector/Sabre/Principal.php b/apps/dav/lib/Connector/Sabre/Principal.php
index 06fb10f7e2..b2f57cf715 100644
--- a/apps/dav/lib/Connector/Sabre/Principal.php
+++ b/apps/dav/lib/Connector/Sabre/Principal.php
@@ -39,7 +39,6 @@ use OCP\Share\IManager as IShareManager;
 use Sabre\DAV\Exception;
 use \Sabre\DAV\PropPatch;
 use Sabre\DAVACL\PrincipalBackend\BackendInterface;
-use Sabre\HTTP\URLUtil;
 
 class Principal implements BackendInterface {
 
diff --git a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
index af45f52683..5222986cb5 100644
--- a/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/QuotaPlugin.php
@@ -26,15 +26,12 @@
  *
  */
 namespace OCA\DAV\Connector\Sabre;
-use OCA\DAV\Files\FilesHome;
 use OCA\DAV\Upload\FutureFile;
-use OCA\DAV\Upload\UploadFolder;
 use OCP\Files\FileInfo;
 use OCP\Files\StorageNotAvailableException;
 use Sabre\DAV\Exception\InsufficientStorage;
 use Sabre\DAV\Exception\ServiceUnavailable;
 use Sabre\DAV\INode;
-use Sabre\HTTP\URLUtil;
 
 /**
  * This plugin check user quota and deny creating files when they exceeds the quota.
diff --git a/apps/dav/lib/Connector/Sabre/ServerFactory.php b/apps/dav/lib/Connector/Sabre/ServerFactory.php
index c120b0be2e..73969865a8 100644
--- a/apps/dav/lib/Connector/Sabre/ServerFactory.php
+++ b/apps/dav/lib/Connector/Sabre/ServerFactory.php
@@ -39,7 +39,6 @@ use OCP\IPreview;
 use OCP\IRequest;
 use OCP\ITagManager;
 use OCP\IUserSession;
-use Sabre\DAV\Auth\Backend\BackendInterface;
 use Sabre\DAV\Auth\Plugin;
 
 class ServerFactory {
diff --git a/apps/dav/lib/DAV/SystemPrincipalBackend.php b/apps/dav/lib/DAV/SystemPrincipalBackend.php
index e3b9302886..77dd5c77ca 100644
--- a/apps/dav/lib/DAV/SystemPrincipalBackend.php
+++ b/apps/dav/lib/DAV/SystemPrincipalBackend.php
@@ -24,7 +24,6 @@
 namespace OCA\DAV\DAV;
 
 use Sabre\DAVACL\PrincipalBackend\AbstractBackend;
-use Sabre\HTTP\URLUtil;
 
 class SystemPrincipalBackend extends AbstractBackend {
 
diff --git a/apps/dav/lib/Files/FilesHome.php b/apps/dav/lib/Files/FilesHome.php
index 8820ef6ffb..63e7916edc 100644
--- a/apps/dav/lib/Files/FilesHome.php
+++ b/apps/dav/lib/Files/FilesHome.php
@@ -27,7 +27,6 @@ namespace OCA\DAV\Files;
 use OCA\DAV\Connector\Sabre\Directory;
 use OCP\Files\FileInfo;
 use Sabre\DAV\Exception\Forbidden;
-use Sabre\HTTP\URLUtil;
 
 class FilesHome extends Directory {
 
diff --git a/apps/dav/lib/Files/RootCollection.php b/apps/dav/lib/Files/RootCollection.php
index 28f98483c4..59b6690a02 100644
--- a/apps/dav/lib/Files/RootCollection.php
+++ b/apps/dav/lib/Files/RootCollection.php
@@ -25,7 +25,6 @@ namespace OCA\DAV\Files;
 
 use Sabre\DAV\INode;
 use Sabre\DAVACL\AbstractPrincipalCollection;
-use Sabre\HTTP\URLUtil;
 use Sabre\DAV\SimpleCollection;
 
 class RootCollection extends AbstractPrincipalCollection {
diff --git a/apps/dav/lib/Server.php b/apps/dav/lib/Server.php
index dfa19467e5..84426db04c 100644
--- a/apps/dav/lib/Server.php
+++ b/apps/dav/lib/Server.php
@@ -32,9 +32,7 @@
  */
 namespace OCA\DAV;
 
-use OC\AppFramework\Utility\TimeFactory;
 use OCA\DAV\CalDAV\BirthdayService;
-use OCA\DAV\CalDAV\Schedule\IMipPlugin;
 use OCA\DAV\CardDAV\ImageExportPlugin;
 use OCA\DAV\CardDAV\PhotoCache;
 use OCA\DAV\Comments\CommentsPlugin;
diff --git a/apps/dav/lib/Upload/ChunkingPlugin.php b/apps/dav/lib/Upload/ChunkingPlugin.php
index 5768f53c2b..a3f6e528c6 100644
--- a/apps/dav/lib/Upload/ChunkingPlugin.php
+++ b/apps/dav/lib/Upload/ChunkingPlugin.php
@@ -22,8 +22,6 @@
 
 namespace OCA\DAV\Upload;
 
-
-use OCA\DAV\Connector\Sabre\File;
 use Sabre\DAV\Exception\BadRequest;
 use Sabre\DAV\Server;
 use Sabre\DAV\ServerPlugin;
diff --git a/apps/encryption/lib/AppInfo/Application.php b/apps/encryption/lib/AppInfo/Application.php
index 2130044d1f..da59169694 100644
--- a/apps/encryption/lib/AppInfo/Application.php
+++ b/apps/encryption/lib/AppInfo/Application.php
@@ -40,7 +40,6 @@ use OCA\Encryption\Recovery;
 use OCA\Encryption\Session;
 use OCA\Encryption\Users\Setup;
 use OCA\Encryption\Util;
-use OCP\App;
 use OCP\AppFramework\IAppContainer;
 use OCP\Encryption\IManager;
 use OCP\IConfig;
diff --git a/apps/encryption/lib/Hooks/UserHooks.php b/apps/encryption/lib/Hooks/UserHooks.php
index 1dade9f782..dc3a4d3c42 100644
--- a/apps/encryption/lib/Hooks/UserHooks.php
+++ b/apps/encryption/lib/Hooks/UserHooks.php
@@ -34,7 +34,6 @@ use OCA\Encryption\Hooks\Contracts\IHook;
 use OCA\Encryption\KeyManager;
 use OCA\Encryption\Crypto\Crypt;
 use OCA\Encryption\Users\Setup;
-use OCP\App;
 use OCP\ILogger;
 use OCP\IUserSession;
 use OCA\Encryption\Util;
diff --git a/apps/federation/lib/BackgroundJob/GetSharedSecret.php b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
index 829e04ddb2..e5e30406f0 100644
--- a/apps/federation/lib/BackgroundJob/GetSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/GetSharedSecret.php
@@ -31,7 +31,6 @@
 namespace OCA\Federation\BackgroundJob;
 
 use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Ring\Exception\RingException;
 use OC\BackgroundJob\JobList;
diff --git a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
index ad7504da7a..e165c24bdf 100644
--- a/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
+++ b/apps/federation/lib/BackgroundJob/RequestSharedSecret.php
@@ -32,7 +32,6 @@ namespace OCA\Federation\BackgroundJob;
 
 
 use GuzzleHttp\Exception\ClientException;
-use GuzzleHttp\Exception\ConnectException;
 use GuzzleHttp\Exception\RequestException;
 use GuzzleHttp\Ring\Exception\RingException;
 use OC\BackgroundJob\JobList;
diff --git a/apps/federation/lib/SyncJob.php b/apps/federation/lib/SyncJob.php
index 23255f2a44..258d0f2fc9 100644
--- a/apps/federation/lib/SyncJob.php
+++ b/apps/federation/lib/SyncJob.php
@@ -24,7 +24,6 @@
 namespace OCA\Federation;
 
 use OC\BackgroundJob\TimedJob;
-use OCA\Federation\AppInfo\Application;
 use OCP\ILogger;
 
 class SyncJob extends TimedJob {
diff --git a/apps/files_external/lib/AppInfo/Application.php b/apps/files_external/lib/AppInfo/Application.php
index e32828fbf4..e037b9b34e 100644
--- a/apps/files_external/lib/AppInfo/Application.php
+++ b/apps/files_external/lib/AppInfo/Application.php
@@ -31,7 +31,6 @@ namespace OCA\Files_External\AppInfo;
 
 use \OCP\AppFramework\App;
 use OCP\AppFramework\IAppContainer;
-use \OCP\IContainer;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Config\IBackendProvider;
 use \OCA\Files_External\Lib\Config\IAuthMechanismProvider;
diff --git a/apps/files_external/lib/Controller/AjaxController.php b/apps/files_external/lib/Controller/AjaxController.php
index 66cbcae3e8..6404fb9de5 100644
--- a/apps/files_external/lib/Controller/AjaxController.php
+++ b/apps/files_external/lib/Controller/AjaxController.php
@@ -30,8 +30,6 @@ namespace OCA\Files_External\Controller;
 
 use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\Response;
 use OCP\IGroupManager;
 use OCP\IRequest;
 use OCP\AppFramework\Http\JSONResponse;
diff --git a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php
index 3c5798ccee..c1397ae8f8 100644
--- a/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php
+++ b/apps/files_external/lib/Lib/Auth/Password/GlobalAuth.php
@@ -29,7 +29,6 @@ use OCP\IUser;
 use OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCA\Files_External\Lib\StorageConfig;
 use OCP\Security\ICredentialsManager;
-use OCP\Files\Storage;
 use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 
 /**
diff --git a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php
index 80703b52a9..dfdfd07298 100644
--- a/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php
+++ b/apps/files_external/lib/Lib/Auth/Password/LoginCredentials.php
@@ -24,13 +24,10 @@ namespace OCA\Files_External\Lib\Auth\Password;
 
 use \OCP\IL10N;
 use \OCP\IUser;
-use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCP\ISession;
 use \OCP\Security\ICredentialsManager;
-use \OCP\Files\Storage;
-use \OCA\Files_External\Lib\SessionStorageWrapper;
 use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 
 /**
diff --git a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php
index 7eb2f63e7d..6bac2bd9c1 100644
--- a/apps/files_external/lib/Lib/Auth/Password/UserProvided.php
+++ b/apps/files_external/lib/Lib/Auth/Password/UserProvided.php
@@ -30,7 +30,6 @@ use OCP\IUser;
 use OCA\Files_External\Lib\Auth\AuthMechanism;
 use OCA\Files_External\Lib\StorageConfig;
 use OCP\Security\ICredentialsManager;
-use OCP\Files\Storage;
 use OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 
 /**
diff --git a/apps/files_external/lib/Lib/Backend/AmazonS3.php b/apps/files_external/lib/Lib/Backend/AmazonS3.php
index d21794a684..509c6453dc 100644
--- a/apps/files_external/lib/Lib/Backend/AmazonS3.php
+++ b/apps/files_external/lib/Lib/Backend/AmazonS3.php
@@ -23,12 +23,8 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
-use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
-
 use \OCA\Files_External\Lib\Auth\AmazonS3\AccessKey;
 
 class AmazonS3 extends Backend {
diff --git a/apps/files_external/lib/Lib/Backend/DAV.php b/apps/files_external/lib/Lib/Backend/DAV.php
index 95d804ba94..2863a33c2c 100644
--- a/apps/files_external/lib/Lib/Backend/DAV.php
+++ b/apps/files_external/lib/Lib/Backend/DAV.php
@@ -23,12 +23,9 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
-
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class DAV extends Backend {
diff --git a/apps/files_external/lib/Lib/Backend/FTP.php b/apps/files_external/lib/Lib/Backend/FTP.php
index 12aee8114f..d224d23128 100644
--- a/apps/files_external/lib/Lib/Backend/FTP.php
+++ b/apps/files_external/lib/Lib/Backend/FTP.php
@@ -23,12 +23,9 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
-
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class FTP extends Backend {
diff --git a/apps/files_external/lib/Lib/Backend/LegacyBackend.php b/apps/files_external/lib/Lib/Backend/LegacyBackend.php
index 4d3aa3e7e9..3fc073b842 100644
--- a/apps/files_external/lib/Lib/Backend/LegacyBackend.php
+++ b/apps/files_external/lib/Lib/Backend/LegacyBackend.php
@@ -23,7 +23,6 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCA\Files_External\Lib\DefinitionParameter;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\Auth\Builtin;
 use \OCA\Files_External\Lib\MissingDependency;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
diff --git a/apps/files_external/lib/Lib/Backend/Local.php b/apps/files_external/lib/Lib/Backend/Local.php
index 528528f292..e0a2734d7b 100644
--- a/apps/files_external/lib/Lib/Backend/Local.php
+++ b/apps/files_external/lib/Lib/Backend/Local.php
@@ -23,7 +23,6 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
diff --git a/apps/files_external/lib/Lib/Backend/OwnCloud.php b/apps/files_external/lib/Lib/Backend/OwnCloud.php
index 7dcd1f2721..cbf28be2bf 100644
--- a/apps/files_external/lib/Lib/Backend/OwnCloud.php
+++ b/apps/files_external/lib/Lib/Backend/OwnCloud.php
@@ -24,11 +24,8 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_External\Service\BackendService;
-
 use \OCA\Files_External\Lib\Auth\Password\Password;
 
 class OwnCloud extends Backend {
diff --git a/apps/files_external/lib/Lib/Backend/SFTP_Key.php b/apps/files_external/lib/Lib/Backend/SFTP_Key.php
index 62f108cd9d..73d3acd356 100644
--- a/apps/files_external/lib/Lib/Backend/SFTP_Key.php
+++ b/apps/files_external/lib/Lib/Backend/SFTP_Key.php
@@ -23,12 +23,9 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\PublicKey\RSA;
-use \OCA\Files_External\Lib\Backend\SFTP;
 
 class SFTP_Key extends Backend {
 
diff --git a/apps/files_external/lib/Lib/Backend/SMB.php b/apps/files_external/lib/Lib/Backend/SMB.php
index 38e386005a..f5335f4940 100644
--- a/apps/files_external/lib/Lib/Backend/SMB.php
+++ b/apps/files_external/lib/Lib/Backend/SMB.php
@@ -23,10 +23,8 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
 
diff --git a/apps/files_external/lib/Lib/Backend/SMB_OC.php b/apps/files_external/lib/Lib/Backend/SMB_OC.php
index 54d941ff1d..074c729b42 100644
--- a/apps/files_external/lib/Lib/Backend/SMB_OC.php
+++ b/apps/files_external/lib/Lib/Backend/SMB_OC.php
@@ -23,14 +23,12 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
 use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\Password\SessionCredentials;
 use \OCA\Files_External\Lib\StorageConfig;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
-use \OCA\Files_External\Lib\Backend\SMB;
 use OCP\IUser;
 
 /**
diff --git a/apps/files_external/lib/Lib/Backend/Swift.php b/apps/files_external/lib/Lib/Backend/Swift.php
index b0a69ae51e..f2b694362f 100644
--- a/apps/files_external/lib/Lib/Backend/Swift.php
+++ b/apps/files_external/lib/Lib/Backend/Swift.php
@@ -23,10 +23,8 @@
 namespace OCA\Files_External\Lib\Backend;
 
 use \OCP\IL10N;
-use \OCA\Files_External\Lib\Backend\Backend;
 use \OCA\Files_External\Lib\DefinitionParameter;
 use \OCA\Files_External\Lib\Auth\AuthMechanism;
-use \OCA\Files_External\Service\BackendService;
 use \OCA\Files_External\Lib\Auth\OpenStack\OpenStack;
 use \OCA\Files_External\Lib\Auth\OpenStack\Rackspace;
 use \OCA\Files_External\Lib\LegacyDependencyCheckPolyfill;
diff --git a/apps/files_external/lib/Lib/DependencyTrait.php b/apps/files_external/lib/Lib/DependencyTrait.php
index bae2d277a5..1d99fa9c16 100644
--- a/apps/files_external/lib/Lib/DependencyTrait.php
+++ b/apps/files_external/lib/Lib/DependencyTrait.php
@@ -22,8 +22,6 @@
 
 namespace OCA\Files_External\Lib;
 
-use \OCA\Files_External\Lib\MissingDependency;
-
 /**
  * Trait for objects that have dependencies for use
  */
diff --git a/apps/files_external/lib/Lib/FrontendDefinitionTrait.php b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php
index 25b3cb4fc2..89fb62932a 100644
--- a/apps/files_external/lib/Lib/FrontendDefinitionTrait.php
+++ b/apps/files_external/lib/Lib/FrontendDefinitionTrait.php
@@ -24,8 +24,6 @@
 
 namespace OCA\Files_External\Lib;
 
-use \OCA\Files_External\Lib\DefinitionParameter;
-use \OCA\Files_External\Lib\StorageConfig;
 
 /**
  * Trait for objects that have a frontend representation
diff --git a/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
index 4db4e6d74d..07fe99f940 100644
--- a/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
+++ b/apps/files_external/lib/Lib/LegacyDependencyCheckPolyfill.php
@@ -22,7 +22,6 @@
 
 namespace OCA\Files_External\Lib;
 
-use \OCA\Files_External\Lib\MissingDependency;
 
 /**
  * Polyfill for checking dependencies using legacy Storage::checkDependencies()
diff --git a/apps/files_external/lib/Lib/SessionStorageWrapper.php b/apps/files_external/lib/Lib/SessionStorageWrapper.php
index ba0f68b4e1..37cd0eae9e 100644
--- a/apps/files_external/lib/Lib/SessionStorageWrapper.php
+++ b/apps/files_external/lib/Lib/SessionStorageWrapper.php
@@ -22,7 +22,6 @@
 
 namespace OCA\Files_External\Lib;
 
-use \OCP\Files\Storage;
 use \OC\Files\Storage\Wrapper\PermissionsMask;
 use \OCP\Constants;
 
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
index aaa7e95bbd..88a1cf4c38 100644
--- a/apps/files_external/lib/Lib/Storage/Swift.php
+++ b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -49,7 +49,6 @@ use OpenCloud\Common\Exceptions;
 use OpenCloud\OpenStack;
 use OpenCloud\Rackspace;
 use OpenCloud\ObjectStore\Resource\DataObject;
-use OpenCloud\ObjectStore\Exception;
 
 class Swift extends \OC\Files\Storage\Common {
 
diff --git a/apps/files_external/lib/Lib/StorageModifierTrait.php b/apps/files_external/lib/Lib/StorageModifierTrait.php
index 3327869e1a..a0f5c53382 100644
--- a/apps/files_external/lib/Lib/StorageModifierTrait.php
+++ b/apps/files_external/lib/Lib/StorageModifierTrait.php
@@ -24,8 +24,6 @@ namespace OCA\Files_External\Lib;
 
 use \OCP\IUser;
 use \OCP\Files\Storage;
-use \OCA\Files_External\Lib\StorageConfig;
-use \OCA\Files_External\Lib\InsufficientDataForMeaningfulAnswerException;
 use \OCP\Files\StorageNotAvailableException;
 
 /**
diff --git a/apps/files_external/lib/Migration/StorageMigrator.php b/apps/files_external/lib/Migration/StorageMigrator.php
index 2ecc5d6cd6..ceb5f4a2bd 100644
--- a/apps/files_external/lib/Migration/StorageMigrator.php
+++ b/apps/files_external/lib/Migration/StorageMigrator.php
@@ -27,7 +27,6 @@ namespace OCA\Files_External\Migration;
 use OCA\Files_External\Service\BackendService;
 use OCA\Files_External\Service\DBConfigService;
 use OCA\Files_External\Service\GlobalLegacyStoragesService;
-use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\LegacyStoragesService;
 use OCA\Files_External\Service\StoragesService;
 use OCA\Files_External\Service\UserLegacyStoragesService;
diff --git a/apps/files_external/lib/Service/UserStoragesService.php b/apps/files_external/lib/Service/UserStoragesService.php
index db03befa85..0c422b2b85 100644
--- a/apps/files_external/lib/Service/UserStoragesService.php
+++ b/apps/files_external/lib/Service/UserStoragesService.php
@@ -32,8 +32,6 @@ use \OC\Files\Filesystem;
 
 use OCA\Files_External\Lib\StorageConfig;
 use OCA\Files_External\NotFoundException;
-use \OCA\Files_External\Service\BackendService;
-use \OCA\Files_External\Service\UserTrait;
 
 /**
  * Service class to manage user external storages
diff --git a/apps/files_external/lib/Settings/Personal.php b/apps/files_external/lib/Settings/Personal.php
index 7aec459bfb..1bd140f0b3 100644
--- a/apps/files_external/lib/Settings/Personal.php
+++ b/apps/files_external/lib/Settings/Personal.php
@@ -25,7 +25,6 @@ namespace OCA\Files_External\Settings;
 
 use OCA\Files_External\Lib\Auth\Password\GlobalAuth;
 use OCA\Files_External\Service\BackendService;
-use OCA\Files_External\Service\GlobalStoragesService;
 use OCA\Files_External\Service\UserGlobalStoragesService;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Encryption\IManager;
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index b5b2979ec6..795d069c1b 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -35,7 +35,6 @@
 
 namespace OCA\Files_Sharing\Controller;
 
-use OC\Files\Node\Folder;
 use OC_Files;
 use OC_Util;
 use OCA\FederatedFileSharing\FederatedShareProvider;
diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php
index 28bfcd12c2..14b56d2895 100644
--- a/apps/files_sharing/lib/Controller/ShareInfoController.php
+++ b/apps/files_sharing/lib/Controller/ShareInfoController.php
@@ -31,7 +31,6 @@ use OCP\Constants;
 use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Files\Node;
-use OCP\ILogger;
 use OCP\IRequest;
 use OCP\Share\Exceptions\ShareNotFound;
 use OCP\Share\IManager;
diff --git a/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php
index 74a5db4f30..7a6ecc483e 100644
--- a/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php
+++ b/apps/files_sharing/lib/Middleware/ShareInfoMiddleware.php
@@ -23,7 +23,6 @@
  */
 namespace OCA\Files_Sharing\Middleware;
 
-use OCA\FederatedFileSharing\FederatedShareProvider;
 use OCA\Files_Sharing\Controller\ShareInfoController;
 use OCA\Files_Sharing\Exceptions\S2SException;
 use OCP\AppFramework\Controller;
diff --git a/apps/sharebymail/templates/settings-admin.php b/apps/sharebymail/templates/settings-admin.php
index 50fede8668..5b16f551a5 100644
--- a/apps/sharebymail/templates/settings-admin.php
+++ b/apps/sharebymail/templates/settings-admin.php
@@ -1,6 +1,5 @@
 <?php
 /** @var array $_ */
-use OCA\Federation\TrustedServers;
 
 /** @var \OCP\IL10N $l */
 script('sharebymail', 'settings-admin');
diff --git a/apps/systemtags/lib/Activity/Listener.php b/apps/systemtags/lib/Activity/Listener.php
index 766e08ee8c..c33e42c28f 100644
--- a/apps/systemtags/lib/Activity/Listener.php
+++ b/apps/systemtags/lib/Activity/Listener.php
@@ -34,7 +34,6 @@ use OCP\IGroup;
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\IUserSession;
-use OCP\Share;
 use OCP\Share\IShareHelper;
 use OCP\SystemTag\ISystemTag;
 use OCP\SystemTag\ISystemTagManager;
diff --git a/apps/theming/lib/Controller/ThemingController.php b/apps/theming/lib/Controller/ThemingController.php
index f27841c004..4e9ce1b646 100644
--- a/apps/theming/lib/Controller/ThemingController.php
+++ b/apps/theming/lib/Controller/ThemingController.php
@@ -32,7 +32,6 @@
 
 namespace OCA\Theming\Controller;
 
-use OC\Files\AppData\Factory;
 use OC\Template\SCSSCacher;
 use OCA\Theming\ThemingDefaults;
 use OCP\AppFramework\Controller;
@@ -48,7 +47,6 @@ use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OCP\IConfig;
 use OCP\IL10N;
-use OCP\ILogger;
 use OCP\IRequest;
 use OCA\Theming\Util;
 use OCP\ITempManager;
diff --git a/apps/theming/lib/Util.php b/apps/theming/lib/Util.php
index 2f6f412836..b72cc5b899 100644
--- a/apps/theming/lib/Util.php
+++ b/apps/theming/lib/Util.php
@@ -31,7 +31,6 @@ use OCP\Files\IAppData;
 use OCP\Files\NotFoundException;
 use OCP\Files\SimpleFS\ISimpleFile;
 use OCP\IConfig;
-use OCP\Files\IRootFolder;
 use Leafo\ScssPhp\Compiler;
 
 class Util {
diff --git a/apps/user_ldap/lib/Controller/RenewPasswordController.php b/apps/user_ldap/lib/Controller/RenewPasswordController.php
index 9cdcdddb14..f6b7ae12f0 100644
--- a/apps/user_ldap/lib/Controller/RenewPasswordController.php
+++ b/apps/user_ldap/lib/Controller/RenewPasswordController.php
@@ -24,7 +24,6 @@
 namespace OCA\User_LDAP\Controller;
 
 use OC\HintException;
-use OC_Util;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\TemplateResponse;
diff --git a/apps/user_ldap/lib/Jobs/Sync.php b/apps/user_ldap/lib/Jobs/Sync.php
index 0cc0be7d3c..4ef0636a2e 100644
--- a/apps/user_ldap/lib/Jobs/Sync.php
+++ b/apps/user_ldap/lib/Jobs/Sync.php
@@ -25,10 +25,8 @@ namespace OCA\User_LDAP\Jobs;
 
 use OC\BackgroundJob\TimedJob;
 use OC\ServerNotAvailableException;
-use OCA\User_LDAP\Access;
 use OCA\User_LDAP\AccessFactory;
 use OCA\User_LDAP\Configuration;
-use OCA\User_LDAP\Connection;
 use OCA\User_LDAP\ConnectionFactory;
 use OCA\User_LDAP\FilesystemHelper;
 use OCA\User_LDAP\Helper;
diff --git a/apps/user_ldap/lib/Notification/Notifier.php b/apps/user_ldap/lib/Notification/Notifier.php
index 8c9d20c12d..34625a3bef 100644
--- a/apps/user_ldap/lib/Notification/Notifier.php
+++ b/apps/user_ldap/lib/Notification/Notifier.php
@@ -26,8 +26,6 @@
 namespace OCA\User_LDAP\Notification;
 
 
-use OCP\IUser;
-use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Notification\INotification;
 use OCP\Notification\INotifier;
diff --git a/core/Command/Group/AddUser.php b/core/Command/Group/AddUser.php
index 05ae4e2d52..738c25ae13 100644
--- a/core/Command/Group/AddUser.php
+++ b/core/Command/Group/AddUser.php
@@ -26,10 +26,8 @@ namespace OC\Core\Command\Group;
 use OC\Core\Command\Base;
 use OCP\IGroupManager;
 use OCP\IUserManager;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class AddUser extends Base {
diff --git a/core/Command/Group/ListCommand.php b/core/Command/Group/ListCommand.php
index f3703bc109..a2b694b30e 100644
--- a/core/Command/Group/ListCommand.php
+++ b/core/Command/Group/ListCommand.php
@@ -26,9 +26,6 @@ namespace OC\Core\Command\Group;
 use OC\Core\Command\Base;
 use OCP\IGroup;
 use OCP\IGroupManager;
-use OCP\IUser;
-use OCP\IUserManager;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/core/Command/Group/RemoveUser.php b/core/Command/Group/RemoveUser.php
index 09f081004d..964691597b 100644
--- a/core/Command/Group/RemoveUser.php
+++ b/core/Command/Group/RemoveUser.php
@@ -26,10 +26,8 @@ namespace OC\Core\Command\Group;
 use OC\Core\Command\Base;
 use OCP\IGroupManager;
 use OCP\IUserManager;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class RemoveUser extends Base {
diff --git a/core/Command/Maintenance/UpdateHtaccess.php b/core/Command/Maintenance/UpdateHtaccess.php
index 001f07187d..04c870f07a 100644
--- a/core/Command/Maintenance/UpdateHtaccess.php
+++ b/core/Command/Maintenance/UpdateHtaccess.php
@@ -22,12 +22,8 @@
  */
 namespace OC\Core\Command\Maintenance;
 
-use InvalidArgumentException;
-use OC\Setup;
-use OCP\IConfig;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class UpdateHtaccess extends Command {
diff --git a/core/Command/Security/ImportCertificate.php b/core/Command/Security/ImportCertificate.php
index 38a774add5..02c64b81d9 100644
--- a/core/Command/Security/ImportCertificate.php
+++ b/core/Command/Security/ImportCertificate.php
@@ -24,11 +24,8 @@ namespace OC\Core\Command\Security;
 
 use OC\Core\Command\Base;
 use OCP\ICertificateManager;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ImportCertificate extends Base {
diff --git a/core/Command/Security/ListCertificates.php b/core/Command/Security/ListCertificates.php
index fe19348876..2ee9909813 100644
--- a/core/Command/Security/ListCertificates.php
+++ b/core/Command/Security/ListCertificates.php
@@ -26,10 +26,8 @@ use OC\Core\Command\Base;
 use OCP\ICertificate;
 use OCP\ICertificateManager;
 use OCP\IL10N;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCertificates extends Base {
diff --git a/core/Command/Security/RemoveCertificate.php b/core/Command/Security/RemoveCertificate.php
index 8be7123ad0..31ddc73877 100644
--- a/core/Command/Security/RemoveCertificate.php
+++ b/core/Command/Security/RemoveCertificate.php
@@ -25,11 +25,8 @@ namespace OC\Core\Command\Security;
 
 use OC\Core\Command\Base;
 use OCP\ICertificateManager;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Helper\Table;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class RemoveCertificate extends Base {
diff --git a/core/Command/TwoFactorAuth/Base.php b/core/Command/TwoFactorAuth/Base.php
index c534065653..aa4f40fc77 100644
--- a/core/Command/TwoFactorAuth/Base.php
+++ b/core/Command/TwoFactorAuth/Base.php
@@ -25,7 +25,6 @@ namespace OC\Core\Command\TwoFactorAuth;
 
 use OCP\IUserManager;
 use OCP\IUser;
-use Stecman\Component\Symfony\Console\BashCompletion\Completion\CompletionAwareInterface;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
 
 class Base extends \OC\Core\Command\Base {
diff --git a/core/Command/Upgrade.php b/core/Command/Upgrade.php
index 1611b121f3..5a2deea0b6 100644
--- a/core/Command/Upgrade.php
+++ b/core/Command/Upgrade.php
@@ -44,7 +44,6 @@ use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Upgrade extends Command {
diff --git a/core/Command/User/Disable.php b/core/Command/User/Disable.php
index 94be87e6ee..7c6e831570 100644
--- a/core/Command/User/Disable.php
+++ b/core/Command/User/Disable.php
@@ -22,7 +22,6 @@
 
 namespace OC\Core\Command\User;
 
-use OCP\IUser;
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/core/Command/User/Enable.php b/core/Command/User/Enable.php
index d8a983155d..164027d809 100644
--- a/core/Command/User/Enable.php
+++ b/core/Command/User/Enable.php
@@ -22,7 +22,6 @@
 
 namespace OC\Core\Command\User;
 
-use OCP\IUser;
 use OCP\IUserManager;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
diff --git a/core/Command/User/Info.php b/core/Command/User/Info.php
index f1b5579eb9..3906f40c6a 100644
--- a/core/Command/User/Info.php
+++ b/core/Command/User/Info.php
@@ -25,9 +25,7 @@ namespace OC\Core\Command\User;
 
 use OC\Core\Command\Base;
 use OCP\IGroupManager;
-use OCP\IUser;
 use OCP\IUserManager;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/core/Command/User/ListCommand.php b/core/Command/User/ListCommand.php
index 77d99eb213..06ba1f0b85 100644
--- a/core/Command/User/ListCommand.php
+++ b/core/Command/User/ListCommand.php
@@ -26,7 +26,6 @@ namespace OC\Core\Command\User;
 use OC\Core\Command\Base;
 use OCP\IUser;
 use OCP\IUserManager;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/core/Controller/AvatarController.php b/core/Controller/AvatarController.php
index 0d0a027441..14709d65fe 100644
--- a/core/Controller/AvatarController.php
+++ b/core/Controller/AvatarController.php
@@ -34,7 +34,6 @@ use OCP\AppFramework\Http\FileDisplayResponse;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
-use OCP\Files\NotFoundException;
 use OCP\IAvatarManager;
 use OCP\ICache;
 use OCP\ILogger;
diff --git a/lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php b/lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php
index 79359b142a..e09dfdfcb8 100644
--- a/lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/BruteForceMiddleware.php
@@ -26,7 +26,6 @@ namespace OC\AppFramework\Middleware\Security;
 
 use OC\AppFramework\Utility\ControllerMethodReflector;
 use OC\Security\Bruteforce\Throttler;
-use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Middleware;
 use OCP\IRequest;
diff --git a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php
index c3b5a844ed..dca761bdfc 100644
--- a/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php
+++ b/lib/private/AppFramework/Middleware/Security/RateLimitingMiddleware.php
@@ -27,7 +27,6 @@ namespace OC\AppFramework\Middleware\Security;
 use OC\AppFramework\Utility\ControllerMethodReflector;
 use OC\Security\RateLimiting\Exception\RateLimitExceededException;
 use OC\Security\RateLimiting\Limiter;
-use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Middleware;
diff --git a/lib/private/Contacts/ContactsMenu/ContactsStore.php b/lib/private/Contacts/ContactsMenu/ContactsStore.php
index 43600470e1..73319151d6 100644
--- a/lib/private/Contacts/ContactsMenu/ContactsStore.php
+++ b/lib/private/Contacts/ContactsMenu/ContactsStore.php
@@ -27,14 +27,12 @@
 
 namespace OC\Contacts\ContactsMenu;
 
-use OC\Share\Share;
 use OCP\Contacts\ContactsMenu\IEntry;
 use OCP\Contacts\IManager;
 use OCP\IConfig;
 use OCP\IGroupManager;
 use OCP\IUser;
 use OCP\IUserManager;
-use OCP\IUserSession;
 use OCP\Contacts\ContactsMenu\IContactsStore;
 
 class ContactsStore implements IContactsStore {
diff --git a/lib/private/DB/MigrationService.php b/lib/private/DB/MigrationService.php
index 29f717b886..77ac23fe5d 100644
--- a/lib/private/DB/MigrationService.php
+++ b/lib/private/DB/MigrationService.php
@@ -31,8 +31,6 @@ use OCP\AppFramework\QueryException;
 use OCP\IDBConnection;
 use OCP\Migration\IMigrationStep;
 use OCP\Migration\IOutput;
-use Doctrine\DBAL\Schema\Column;
-use Doctrine\DBAL\Schema\Table;
 use Doctrine\DBAL\Types\Type;
 
 class MigrationService {
diff --git a/lib/private/DB/SchemaWrapper.php b/lib/private/DB/SchemaWrapper.php
index 4f05b7b00e..35aae08269 100644
--- a/lib/private/DB/SchemaWrapper.php
+++ b/lib/private/DB/SchemaWrapper.php
@@ -23,7 +23,6 @@
 
 namespace OC\DB;
 
-use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
 use OCP\DB\ISchemaWrapper;
 use OCP\IDBConnection;
diff --git a/lib/private/Files/Config/UserMountCache.php b/lib/private/Files/Config/UserMountCache.php
index 384e6e5e45..cc655018f8 100644
--- a/lib/private/Files/Config/UserMountCache.php
+++ b/lib/private/Files/Config/UserMountCache.php
@@ -25,7 +25,6 @@
 
 namespace OC\Files\Config;
 
-use OC\DB\QueryBuilder\Literal;
 use OCA\Files_Sharing\SharedMount;
 use OCP\DB\QueryBuilder\IQueryBuilder;
 use OCP\Files\Config\ICachedMountFileInfo;
diff --git a/lib/private/Files/ObjectStore/S3ObjectTrait.php b/lib/private/Files/ObjectStore/S3ObjectTrait.php
index defeda4c21..280a8efa81 100644
--- a/lib/private/Files/ObjectStore/S3ObjectTrait.php
+++ b/lib/private/Files/ObjectStore/S3ObjectTrait.php
@@ -23,10 +23,7 @@
 
 namespace OC\Files\ObjectStore;
 
-use Aws\Exception\MultipartUploadException;
-use Aws\S3\MultipartUploader;
 use Aws\S3\S3Client;
-use Psr\Http\Message\StreamInterface;
 
 const S3_UPLOAD_PART_SIZE = 524288000; // 500MB
 
diff --git a/lib/private/Installer.php b/lib/private/Installer.php
index ad2dcb60f2..f382a92340 100644
--- a/lib/private/Installer.php
+++ b/lib/private/Installer.php
@@ -36,17 +36,12 @@
 namespace OC;
 
 use Doctrine\DBAL\Exception\TableExistsException;
-use OC\App\AppManager;
 use OC\App\AppStore\Bundles\Bundle;
 use OC\App\AppStore\Fetcher\AppFetcher;
-use OC\App\CodeChecker\CodeChecker;
-use OC\App\CodeChecker\EmptyCheck;
-use OC\App\CodeChecker\PrivateCheck;
 use OC\Archive\TAR;
 use OC_App;
 use OC_DB;
 use OC_Helper;
-use OCP\App\IAppManager;
 use OCP\Http\Client\IClientService;
 use OCP\IConfig;
 use OCP\ILogger;
diff --git a/lib/private/Repair.php b/lib/private/Repair.php
index d787a1c802..a257ef061e 100644
--- a/lib/private/Repair.php
+++ b/lib/private/Repair.php
@@ -30,8 +30,6 @@
 
 namespace OC;
 
-use OC\App\AppStore\Bundles\BundleFetcher;
-use OC\Files\AppData\Factory;
 use OC\Repair\CleanTags;
 use OC\Repair\ClearFrontendCaches;
 use OC\Repair\Collation;
diff --git a/lib/private/Share/Share.php b/lib/private/Share/Share.php
index 9507eaf5c1..8968034d45 100644
--- a/lib/private/Share/Share.php
+++ b/lib/private/Share/Share.php
@@ -39,12 +39,7 @@
 
 namespace OC\Share;
 
-use OC\Files\Filesystem;
 use OCP\DB\QueryBuilder\IQueryBuilder;
-use OCP\ILogger;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use OCP\IDBConnection;
 use OCP\IConfig;
 use OCP\Util;
 
diff --git a/lib/private/Share20/DefaultShareProvider.php b/lib/private/Share20/DefaultShareProvider.php
index b9ab7a4687..3c56b24707 100644
--- a/lib/private/Share20/DefaultShareProvider.php
+++ b/lib/private/Share20/DefaultShareProvider.php
@@ -30,7 +30,6 @@
 namespace OC\Share20;
 
 use OC\Files\Cache\Cache;
-use OCP\Files\File;
 use OCP\Files\Folder;
 use OCP\Share\IShareProvider;
 use OC\Share20\Exception\InvalidShare;
diff --git a/lib/private/User/Session.php b/lib/private/User/Session.php
index c2b58c37cd..4ac8888cee 100644
--- a/lib/private/User/Session.php
+++ b/lib/private/User/Session.php
@@ -55,7 +55,6 @@ use OCP\ILogger;
 use OCP\IRequest;
 use OCP\ISession;
 use OCP\IUser;
-use OCP\IUserManager;
 use OCP\IUserSession;
 use OCP\Lockdown\ILockdownManager;
 use OCP\Security\ISecureRandom;
diff --git a/lib/public/Util.php b/lib/public/Util.php
index 2fb6bdf491..106107591c 100644
--- a/lib/public/Util.php
+++ b/lib/public/Util.php
@@ -51,7 +51,6 @@
 // use OCP namespace for all classes that are considered public.
 // This means that they should be used by apps instead of the internal ownCloud classes
 namespace OCP;
-use DateTimeZone;
 
 /**
  * This class provides different helper functions to make the life of a developer easier
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 06b9e80294..b5c4945b7c 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -43,7 +43,6 @@ use OCP\IConfig;
 use OCP\IL10N;
 use OCP\ILogger;
 use OCP\IRequest;
-use OC_Util;
 use OCP\IURLGenerator;
 
 /**
diff --git a/settings/Controller/LogSettingsController.php b/settings/Controller/LogSettingsController.php
index ae9e7f4072..6405ff9ec7 100644
--- a/settings/Controller/LogSettingsController.php
+++ b/settings/Controller/LogSettingsController.php
@@ -27,12 +27,7 @@
 namespace OC\Settings\Controller;
 
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\StreamResponse;
-use OCP\IL10N;
-use OCP\IRequest;
-use OCP\IConfig;
 
 /**
  * Class LogSettingsController