diff --git a/blackout/blackout.php b/blackout/blackout.php
index eb0b6ce81..19f99f1e8 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -44,7 +44,6 @@
  * THE SOFTWARE.
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index 166fa7b63..8c6560c01 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\System;
 use Friendica\DI;
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 175f9a14d..b008b52f9 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.php
@@ -9,7 +9,6 @@
 require 'addon/buffer/bufferapp.php';
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index aac2c0a06..db67a3554 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index 2fda864e9..bf4e1c0ea 100644
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/curweather/curweather.php b/curweather/curweather.php
index ef1ffabb8..e4b6119f9 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -11,7 +11,6 @@
 
 use Friendica\App;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 20485c9ef..44d9aebd8 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -10,7 +10,6 @@ use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 85a8f7cc6..7a7a6d9ad 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -5,8 +5,6 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\Core\Cache;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/geonames/geonames.php b/geonames/geonames.php
index 8009a654e..38888ecba 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 303c11419..5ba9dcff0 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/impressum/impressum.php b/impressum/impressum.php
index bff380ad5..9f7917281 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/irc/irc.php b/irc/irc.php
index ad67b5e81..52778e557 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -7,7 +7,6 @@
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 8d93f9409..ad4d49014 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,7 +63,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 2ebd8cc3e..20012a976 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index ba9e89f12..611079965 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -54,7 +54,6 @@
  * ...etc.
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index f7cd0d297..8bb6f526b 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -5,7 +5,6 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 1d70da0a1..c49ac5c59 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -8,7 +8,6 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index e71e1d500..89e6cc014 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index cdd5fddab..a6c95d340 100644
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -12,7 +12,6 @@
 use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
 use Friendica\DI;
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 103d158ac..585568135 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -7,7 +7,6 @@
  ***/
 
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index dc7688738..6519a2431 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -10,7 +10,6 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index dd56b07c7..61fe1efd4 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -11,7 +11,6 @@
 
 use Friendica\DI;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 1da4a42ff..f6e71aa32 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index b55fcccd9..5fab99d29 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
diff --git a/piwik/piwik.php b/piwik/piwik.php
index 0b4322428..6dba45a34 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -31,7 +31,6 @@
  *     setting.
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 098e0d4a7..04500188f 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -8,7 +8,6 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 3a29a203a..c6c492d47 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -9,7 +9,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php
index d6119063f..1bdbbb9d4 100644
--- a/pumpio/pumpio_sync.php
+++ b/pumpio/pumpio_sync.php
@@ -1,5 +1,4 @@
 <?php
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index ad4f1bfb5..268171828 100644
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -7,7 +7,6 @@
  * Status: Unsupported
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 36f2ab5dc..6e6658682 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index d1d472bd2..fa44eb9b3 100644
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -1,6 +1,5 @@
 <?php
 
-use Friendica\Core\Config;
 use Friendica\DI;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index e08229678..0ed0f55c0 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -42,7 +42,6 @@ use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 9f94b7c66..1732c6a98 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index c5a07453a..c0db116e5 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -11,7 +11,6 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . '
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/twitter/twitter.php b/twitter/twitter.php
index b9ec71af7..673b3b753 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -69,7 +69,6 @@ use Friendica\App;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php
index b97dd7d2b..bd4c4444f 100644
--- a/twitter/twitter_sync.php
+++ b/twitter/twitter_sync.php
@@ -1,6 +1,5 @@
 <?php
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\DI;
 
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index c28d84c3a..0399eddef 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -6,7 +6,6 @@
  * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  */
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index c7bf5f7bf..33da97155 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -8,7 +8,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\DI;