diff --git a/apps/files_external/command/listcommand.php b/apps/files_external/command/listcommand.php
index 4c027ffcb8ea8f9348a3b7e7374605b9749d882c..baba9be59f5ee060b9c65f3e5d05a6e1a81fb311 100644
--- a/apps/files_external/command/listcommand.php
+++ b/apps/files_external/command/listcommand.php
@@ -29,7 +29,6 @@ use OCP\IUserManager;
 use OCP\IUserSession;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\Table;
-use Symfony\Component\Console\Helper\TableHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
diff --git a/apps/files_sharing/tests/locking.php b/apps/files_sharing/tests/locking.php
index 3b8900f206148bca84569a25546c4c4ac0988fff..ad7b6b3e8a3b78eb179d7c6a258cd73735e9762b 100644
--- a/apps/files_sharing/tests/locking.php
+++ b/apps/files_sharing/tests/locking.php
@@ -24,7 +24,6 @@ namespace OCA\Files_sharing\Tests;
 
 use OC\Files\Filesystem;
 use OC\Files\View;
-use OC\Lock\MemcacheLockingProvider;
 use OCP\Lock\ILockingProvider;
 
 /**
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index bcae351e0239d74f9692a75c4cd97d965ad7a62b..e55d4e20a81440024013352de9768653134870cb 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -29,9 +29,7 @@ namespace OC\AppFramework\Utility;
 use ReflectionClass;
 use ReflectionException;
 use Closure;
-
 use Pimple\Container;
-
 use OCP\AppFramework\QueryException;
 use OCP\IContainer;
 
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 9f243c15a4c4b999d674a3dc8ecfb65aa76a0ebf..9d1b715068723c059f797dc3bfe65aed26c6358e 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -58,7 +58,6 @@
 
 namespace OC\Files;
 
-use OC\Cache\File;
 use OC\Files\Config\MountProviderCollection;
 use OC\Files\Storage\StorageFactory;
 use OCP\Files\Config\IMountProvider;
diff --git a/lib/private/session/cryptowrapper.php b/lib/private/session/cryptowrapper.php
index c79778587e0e02342a1b1fbff7b65c16502cfd1a..177f11ffb70d51ff49bc073ee5c8f04181b0e3ce 100644
--- a/lib/private/session/cryptowrapper.php
+++ b/lib/private/session/cryptowrapper.php
@@ -23,7 +23,6 @@
 
 namespace OC\Session;
 
-use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\IConfig;
 use OCP\IRequest;
 use OCP\ISession;
diff --git a/settings/controller/userscontroller.php b/settings/controller/userscontroller.php
index 0164d3bcee740e8e3c6810f728573b89e70617ab..8ad975fd6647e5dc9cedf7cd9a3c5c94fe48f894 100644
--- a/settings/controller/userscontroller.php
+++ b/settings/controller/userscontroller.php
@@ -27,7 +27,6 @@
 namespace OC\Settings\Controller;
 
 use OC\AppFramework\Http;
-use OC\Settings\Factory\SubAdminFactory;
 use OC\User\User;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
diff --git a/tests/core/avatar/avatarcontrollertest.php b/tests/core/avatar/avatarcontrollertest.php
index efe41763ff7d0ba6008517f5ef3b4bec74ed9dd1..a113add72b9cca25e5cca4bc91ab9f6311e45b09 100644
--- a/tests/core/avatar/avatarcontrollertest.php
+++ b/tests/core/avatar/avatarcontrollertest.php
@@ -23,14 +23,11 @@ namespace OC\Core\Avatar;
 use OC;
 use OC\Core\Application;
 use OCP\AppFramework\IAppContainer;
-use OC\Files\Filesystem;
 use OCP\AppFramework\Http;
-use OCP\Image;
 use OCP\Files\Folder;
 use OCP\Files\File;
 use OCP\IUser;
 use OCP\IAvatar;
-
 use Test\Traits\UserTrait;
 
 /**
diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index 92a2cc01dd2d5f543cac574f0aea772254a96443..32603d0da599350e726e0c600eb234204589e2df 100644
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -10,7 +10,6 @@
 
 namespace OC\AppFramework\Http;
 
-use OC\Security\Crypto;
 use OCP\Security\ISecureRandom;
 use OCP\IConfig;