diff --git a/mod/display.php b/mod/display.php
index 7d7ea08a8f..ad61134e5f 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
-use Friendica\Core\ACL;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
diff --git a/mod/item.php b/mod/item.php
index 2a365f3da2..73b6ad1891 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -55,7 +55,6 @@ use Friendica\Model\User;
 use Friendica\Network\HTTPException;
 use Friendica\Object\EMail\ItemCCEMail;
 use Friendica\Protocol\Activity;
-use Friendica\Protocol\Diaspora;
 use Friendica\Security\Security;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\ParseUrl;
diff --git a/src/App.php b/src/App.php
index 4342e57ece..d779a48d6e 100644
--- a/src/App.php
+++ b/src/App.php
@@ -36,7 +36,6 @@ use Friendica\Core\Theme;
 use Friendica\Database\Database;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
-use Friendica\Model\User;
 use Friendica\Module\Special\HTTPException as ModuleHTTPException;
 use Friendica\Network\HTTPException;
 use Friendica\Util\ConfigFileLoader;
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 2263b1cae3..3504b9e5a3 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -23,7 +23,6 @@ namespace Friendica\Content;
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/src/Module/Bookmarklet.php b/src/Module/Bookmarklet.php
index 2d882e0fa5..d581b81e85 100644
--- a/src/Module/Bookmarklet.php
+++ b/src/Module/Bookmarklet.php
@@ -23,7 +23,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content\PageInfo;
-use Friendica\Core\ACL;
 use Friendica\DI;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException;
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 2a68262a5e..9685d090e7 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -27,7 +27,6 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
-use Friendica\Core\ACL;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
diff --git a/src/Module/Conversation/Community.php b/src/Module/Conversation/Community.php
index c236778cb4..d80c4aae23 100644
--- a/src/Module/Conversation/Community.php
+++ b/src/Module/Conversation/Community.php
@@ -29,7 +29,6 @@ use Friendica\Content\Nav;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Content\Widget\TrendingTags;
-use Friendica\Core\ACL;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index 8ccf1f7361..19dbe4cddb 100644
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -23,7 +23,6 @@ namespace Friendica\Module\Profile;
 
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
-use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Module/Profile/Profile.php b/src/Module/Profile/Profile.php
index 9f056f8741..7e35fec8b7 100644
--- a/src/Module/Profile/Profile.php
+++ b/src/Module/Profile/Profile.php
@@ -26,7 +26,6 @@ use Friendica\Content\ForumManager;
 use Friendica\Content\Nav;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Content\Widget;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
diff --git a/src/Module/Settings/Profile/Photo/Crop.php b/src/Module/Settings/Profile/Photo/Crop.php
index 0d78ae4c34..f90b16f0e9 100644
--- a/src/Module/Settings/Profile/Photo/Crop.php
+++ b/src/Module/Settings/Profile/Photo/Crop.php
@@ -23,7 +23,6 @@ namespace Friendica\Module\Settings\Profile\Photo;
 
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/src/Module/Settings/UserExport.php b/src/Module/Settings/UserExport.php
index cffa3b99ec..a2a6dc2d2a 100644
--- a/src/Module/Settings/UserExport.php
+++ b/src/Module/Settings/UserExport.php
@@ -21,7 +21,6 @@
 
 namespace Friendica\Module\Settings;
 
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/src/Security/Authentication.php b/src/Security/Authentication.php
index c7a7439572..074cfc2bae 100644
--- a/src/Security/Authentication.php
+++ b/src/Security/Authentication.php
@@ -39,7 +39,6 @@ use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use LightOpenID;
 use Friendica\Core\L10n;
-use Friendica\Core\Logger;
 use Psr\Log\LoggerInterface;
 
 /**
diff --git a/src/Worker/AddContact.php b/src/Worker/AddContact.php
index 9132f3ba12..755373fcd0 100644
--- a/src/Worker/AddContact.php
+++ b/src/Worker/AddContact.php
@@ -23,7 +23,6 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Logger;
 use Friendica\Model\Contact;
-use Friendica\Model\User;
 
 class AddContact
 {