diff --git a/bin/daemon.php b/bin/daemon.php
index 0536814b9a..27edbfee0c 100755
--- a/bin/daemon.php
+++ b/bin/daemon.php
@@ -8,7 +8,6 @@
  */
 
 use Dice\Dice;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/bin/worker.php b/bin/worker.php
index bb71673955..106c9b81f1 100755
--- a/bin/worker.php
+++ b/bin/worker.php
@@ -7,7 +7,6 @@
 
 use Dice\Dice;
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\DI;
diff --git a/boot.php b/boot.php
index 5f8f3a3be3..4e1249e197 100644
--- a/boot.php
+++ b/boot.php
@@ -17,7 +17,6 @@
  * easily as email does today.
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/include/api.php b/include/api.php
index 039275f20e..92b4e4b218 100644
--- a/include/api.php
+++ b/include/api.php
@@ -11,7 +11,6 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 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/include/conversation.php b/include/conversation.php
index 5e8018d723..264fa6ceb4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -8,7 +8,6 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/include/enotify.php b/include/enotify.php
index 8a21adbdf0..4bd9eb6967 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -4,7 +4,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/include/items.php b/include/items.php
index 5d10dd35d5..2230c93c77 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3,7 +3,6 @@
  * @file include/items.php
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/mod/api.php b/mod/api.php
index 48a1e4d46e..8114d27861 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/cal.php b/mod/cal.php
index d8140cf410..cf0e498d56 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/mod/community.php b/mod/community.php
index 9d1fe0f7fb..61922ef88a 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -9,7 +9,6 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget\TrendingTags;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/mod/crepair.php b/mod/crepair.php
index 57da284c81..aec1b60471 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 994c39cdd5..60a96a9266 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -19,7 +19,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 36e520c0d2..a08fe1b48a 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
index 74e2d89467..c444f0389d 100644
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -5,7 +5,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Session;
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index ca32820691..e29109160a 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -13,7 +13,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
diff --git a/mod/display.php b/mod/display.php
index 56836beff1..f06b98dd4a 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -8,7 +8,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
diff --git a/mod/follow.php b/mod/follow.php
index 276a389e83..8956bd5768 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -3,7 +3,6 @@
  * @file mod/follow.php
  */
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\DI;
diff --git a/mod/item.php b/mod/item.php
index 3661dc81d1..a9c5d43580 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -19,7 +19,6 @@ use Friendica\App;
 use Friendica\Content\Pager;
 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/mod/lostpass.php b/mod/lostpass.php
index 479b5c901b..59426a1af8 100644
--- a/mod/lostpass.php
+++ b/mod/lostpass.php
@@ -5,7 +5,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/match.php b/mod/match.php
index 0805af7c56..b262bfd115 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;
diff --git a/mod/network.php b/mod/network.php
index 9b8a0bc574..db6d8eaf45 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -12,7 +12,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/mod/photos.php b/mod/photos.php
index 50e18db47d..c2fb825696 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -9,7 +9,6 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/mod/ping.php b/mod/ping.php
index 614900ec19..4890197074 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -7,7 +7,6 @@ use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/poco.php b/mod/poco.php
index a100ceffbd..8e7d63418a 100644
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -6,7 +6,6 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index e87e44e05b..d34c78363c 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/mod/profiles.php b/mod/profiles.php
index 8b1cc5a30d..551ae54f9b 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -8,7 +8,6 @@ use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
diff --git a/mod/profperm.php b/mod/profperm.php
index 33c958cae7..f17d1d66b7 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -3,7 +3,6 @@
  * @file mod/profperm.php
  */
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Content\Text\HTML;
 use Friendica\Database\DBA;
diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index cdf6b8ee4c..2ffaaf729e 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/regmod.php b/mod/regmod.php
index a7be314449..a3039b7984 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/removeme.php b/mod/removeme.php
index 8f427f3d58..48d4e0e0fe 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/settings.php b/mod/settings.php
index 85fc6e1b80..00991d8919 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -8,7 +8,6 @@ use Friendica\BaseModule;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/mod/uimport.php b/mod/uimport.php
index 64eff338d2..a727e13df4 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -5,7 +5,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\UserImport;
 use Friendica\Core\Renderer;
diff --git a/mod/videos.php b/mod/videos.php
index c14f4cfb7c..a7181d4e78 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -6,7 +6,6 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 8fd274a017..bb5128137f 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index eed3550693..b7504bede1 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -9,7 +9,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/mod/worker.php b/mod/worker.php
index 5c291ad0ba..2ebd463a76 100644
--- a/mod/worker.php
+++ b/mod/worker.php
@@ -4,7 +4,6 @@
  * Module for running the worker as frontend process
  */
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/src/Api/Entity/Mastodon/Instance.php b/src/Api/Entity/Mastodon/Instance.php
index 453abd1c7c..b122f78359 100644
--- a/src/Api/Entity/Mastodon/Instance.php
+++ b/src/Api/Entity/Mastodon/Instance.php
@@ -3,7 +3,6 @@
 namespace Friendica\Api\Entity\Mastodon;
 
 use Friendica\Api\BaseEntity;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
diff --git a/src/Api/Entity/Mastodon/Stats.php b/src/Api/Entity/Mastodon/Stats.php
index 72a2849aca..16c9893a3b 100644
--- a/src/Api/Entity/Mastodon/Stats.php
+++ b/src/Api/Entity/Mastodon/Stats.php
@@ -3,7 +3,6 @@
 namespace Friendica\Api\Entity\Mastodon;
 
 use Friendica\Api\BaseEntity;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/src/Console/AutomaticInstallation.php b/src/Console/AutomaticInstallation.php
index f93b50c1e2..a8e32b498b 100644
--- a/src/Console/AutomaticInstallation.php
+++ b/src/Console/AutomaticInstallation.php
@@ -5,7 +5,8 @@ namespace Friendica\Console;
 use Asika\SimpleConsole\Console;
 use Friendica\App;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config;
+use Friendica\Core\Config\IConfig;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\Installer;
 use Friendica\Core\Theme;
 use Friendica\Database\Database;
@@ -15,23 +16,13 @@ use RuntimeException;
 
 class AutomaticInstallation extends Console
 {
-	/**
-	 * @var App\Mode
-	 */
+	/** @var App\Mode */
 	private $appMode;
-	/**
-	 * @var \Friendica\Core\Config\Cache
-	 */
+	/** @var Cache */
 	private $configCache;
-
-	/**
-	 * @var Config\IConfig
-	 */
+	/** @var IConfig */
 	private $config;
-
-	/**
-	 * @var Database
-	 */
+	/** @var Database */
 	private $dba;
 
 	protected function getHelp()
@@ -89,14 +80,14 @@ Examples
 HELP;
 	}
 
-	public function __construct(App\Mode $appMode, Config\Cache $configCache, Config\IConfig $config, Database $dba, array $argv = null)
+	public function __construct(App\Mode $appMode, Cache $configCache, IConfig $config, Database $dba, array $argv = null)
 	{
 		parent::__construct($argv);
 
-		$this->appMode = $appMode;
-		$this->configCache  =$configCache;
-		$this->config = $config;
-		$this->dba = $dba;
+		$this->appMode     = $appMode;
+		$this->configCache = $configCache;
+		$this->config      = $config;
+		$this->dba         = $dba;
 	}
 
 	protected function doExecute()
@@ -106,9 +97,9 @@ HELP;
 
 		$installer = new Installer();
 
-		$configCache = $this->configCache;
+		$configCache  = $this->configCache;
 		$basePathConf = $configCache->get('system', 'basepath');
-		$basepath = new BasePath($basePathConf);
+		$basepath     = new BasePath($basePathConf);
 		$installer->setUpCache($configCache, $basepath->getPath());
 
 		$this->out(" Complete!\n\n");
@@ -241,18 +232,18 @@ HELP;
 	}
 
 	/**
-	 * @param Installer                    $installer   The Installer instance
-	 * @param \Friendica\Core\Config\Cache $configCache The config cache
+	 * @param Installer $installer   The Installer instance
+	 * @param Cache     $configCache The config cache
 	 *
 	 * @return bool true if checks were successfully, otherwise false
 	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
-	private function runBasicChecks(Installer $installer, Config\Cache $configCache)
+	private function runBasicChecks(Installer $installer, Cache $configCache)
 	{
 		$checked = true;
 
 		$installer->resetChecks();
-		if (!$installer->checkFunctions())		{
+		if (!$installer->checkFunctions()) {
 			$checked = false;
 		}
 		if (!$installer->checkImagick()) {
@@ -281,11 +272,12 @@ HELP;
 
 	/**
 	 * @param array $results
+	 *
 	 * @return string
 	 */
 	private function extractErrors($results)
 	{
-		$errorMessage = '';
+		$errorMessage      = '';
 		$allChecksRequired = $this->getOption('a') !== null;
 
 		foreach ($results as $result) {
diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index 4d89170d61..91a319677f 100644
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -5,7 +5,6 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\DI;
 
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 64e4c79c4d..6b4de60361 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -5,7 +5,6 @@
 namespace Friendica\Content;
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php
index a92898b3c0..14253b490c 100644
--- a/src/Content/OEmbed.php
+++ b/src/Content/OEmbed.php
@@ -11,7 +11,6 @@ use DOMText;
 use DOMXPath;
 use Exception;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 5e87fd86cc..7a42f9ba47 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -14,7 +14,6 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\DI;
 use Friendica\Util\Strings;
diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 1bcd7b09a7..f8b9fb2985 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -10,7 +10,6 @@ use DOMXPath;
 use Exception;
 use Friendica\Content\OEmbed;
 use Friendica\Content\Smilies;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 38814e0ca1..bae0cb854c 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -9,7 +9,6 @@ use DOMDocument;
 use DOMXPath;
 use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Hook;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 1aa26fdd40..a38b9a3051 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -5,7 +5,6 @@
 namespace Friendica\Content;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index 18832b8e50..686f0582c9 100644
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -6,7 +6,6 @@
 namespace Friendica\Database;
 
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 44e203ab49..64737f604f 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Database;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\DI;
diff --git a/src/Factory/ConfigFactory.php b/src/Factory/ConfigFactory.php
index 585d6eb7ee..578f3191cd 100644
--- a/src/Factory/ConfigFactory.php
+++ b/src/Factory/ConfigFactory.php
@@ -2,6 +2,7 @@
 
 namespace Friendica\Factory;
 
+use Exception;
 use Friendica\Core\Config;
 use Friendica\Core\Config\Cache;
 use Friendica\Model\Config\Config as ConfigModel;
@@ -14,6 +15,8 @@ class ConfigFactory
 	 * @param ConfigFileLoader $loader The Config Cache loader (INI/config/.htconfig)
 	 *
 	 * @return Cache
+	 *
+	 * @throws Exception
 	 */
 	public function createCache(ConfigFileLoader $loader)
 	{
diff --git a/src/Model/APContact.php b/src/Model/APContact.php
index 2296205d3c..dd27daf10d 100644
--- a/src/Model/APContact.php
+++ b/src/Model/APContact.php
@@ -8,7 +8,6 @@ namespace Friendica\Model;
 
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Protocol\ActivityPub;
diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index 9b8f98c78d..08c67f8efa 100644
--- a/src/Model/Contact.php
+++ b/src/Model/Contact.php
@@ -6,7 +6,6 @@ namespace Friendica\Model;
 
 use Friendica\App\BaseURL;
 use Friendica\Content\Pager;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/src/Model/GContact.php b/src/Model/GContact.php
index b029cd40d1..206e7049d0 100644
--- a/src/Model/GContact.php
+++ b/src/Model/GContact.php
@@ -8,7 +8,6 @@ namespace Friendica\Model;
 use DOMDocument;
 use DOMXPath;
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
diff --git a/src/Model/GServer.php b/src/Model/GServer.php
index 34bb8559c6..d113f0ace4 100644
--- a/src/Model/GServer.php
+++ b/src/Model/GServer.php
@@ -8,7 +8,6 @@ namespace Friendica\Model;
 
 use DOMDocument;
 use DOMXPath;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 7c49626906..9f2f45e74a 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -8,7 +8,6 @@ namespace Friendica\Model;
 
 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/src/Model/Photo.php b/src/Model/Photo.php
index 0546b14c1f..804ae328ef 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -7,7 +7,6 @@
 namespace Friendica\Model;
 
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 77e3471831..341727ceef 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/src/Model/User.php b/src/Model/User.php
index 65c11258ff..0e8d11f733 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -9,7 +9,6 @@ namespace Friendica\Model;
 
 use DivineOmega\PasswordExposed;
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php
index 652439efcc..6c07885993 100644
--- a/src/Module/Admin/Blocklist/Server.php
+++ b/src/Module/Admin/Blocklist/Server.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module\Admin\Blocklist;
 
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php
index e4382319c9..c342db93b4 100644
--- a/src/Module/Admin/DBSync.php
+++ b/src/Module/Admin/DBSync.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module\Admin;
 
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Update;
 use Friendica\Database\DBA;
diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php
index b73e35f549..ed5abec95a 100644
--- a/src/Module/Admin/Features.php
+++ b/src/Module/Admin/Features.php
@@ -3,7 +3,6 @@
 namespace Friendica\Module\Admin;
 
 use Friendica\Content\Feature;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php
index 58b837ed89..0d83cc41a1 100644
--- a/src/Module/Admin/Federation.php
+++ b/src/Module/Admin/Federation.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module\Admin;
 
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php
index b4c1864ff6..6b3f2027dc 100644
--- a/src/Module/Admin/Logs/Settings.php
+++ b/src/Module/Admin/Logs/Settings.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module\Admin\Logs;
 
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php
index 9921b943db..a6607829de 100644
--- a/src/Module/Admin/Logs/View.php
+++ b/src/Module/Admin/Logs/View.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module\Admin\Logs;
 
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 035c7c6e0c..131ebb88ef 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -3,7 +3,6 @@
 namespace Friendica\Module\Admin;
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Core\Theme;
diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index e5adc27186..234a49b410 100644
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -3,7 +3,7 @@
 namespace Friendica\Module\Admin;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
+use Friendica\Core\Config\Cache;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Update;
@@ -110,7 +110,7 @@ class Summary extends BaseAdminModule
 
 		// check legacy basepath settings
 		$configLoader = new ConfigFileLoader($a->getBasePath());
-		$configCache = new Config\Cache();
+		$configCache = new Cache();
 		$configLoader->setupCache($configCache);
 		$confBasepath = $configCache->get('system', 'basepath');
 		$currBasepath = DI::config()->get('system', 'basepath');
diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php
index 182906c2ef..c6c86b0a99 100644
--- a/src/Module/Admin/Themes/Index.php
+++ b/src/Module/Admin/Themes/Index.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module\Admin\Themes;
 
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Theme;
 use Friendica\DI;
diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php
index aa819fe41a..4c4f31b655 100644
--- a/src/Module/Admin/Tos.php
+++ b/src/Module/Admin/Tos.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module\Admin;
 
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Module\BaseAdminModule;
diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php
index 41ccb97528..c4a30abd65 100644
--- a/src/Module/Admin/Users.php
+++ b/src/Module/Admin/Users.php
@@ -3,7 +3,6 @@
 namespace Friendica\Module\Admin;
 
 use Friendica\Content\Pager;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/src/Module/Apps.php b/src/Module/Apps.php
index 84a36295a5..445db070b9 100644
--- a/src/Module/Apps.php
+++ b/src/Module/Apps.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content\Nav;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/src/Module/Contact/Hovercard.php b/src/Module/Contact/Hovercard.php
index 48854136b3..199c47ac6e 100644
--- a/src/Module/Contact/Hovercard.php
+++ b/src/Module/Contact/Hovercard.php
@@ -3,7 +3,6 @@
 namespace Friendica\Module\Contact;
 
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/src/Module/Group.php b/src/Module/Group.php
index ead70c333e..beeb6dfa0c 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -6,7 +6,6 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index cac1fbd919..21f2698b7c 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -6,9 +6,7 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Protocol\ActivityPub;
diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index e1903b8c55..97c108841c 100644
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -7,7 +7,6 @@ use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Session;
 use Friendica\Core\System;
diff --git a/src/Module/Profile/Contacts.php b/src/Module/Profile/Contacts.php
index ce9234da73..09691100aa 100644
--- a/src/Module/Profile/Contacts.php
+++ b/src/Module/Profile/Contacts.php
@@ -6,7 +6,6 @@ use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
-use Friendica\Core\Config;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Module/Register.php b/src/Module/Register.php
index 4f12a89855..8a92b25088 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
diff --git a/src/Module/Search/Index.php b/src/Module/Search/Index.php
index 737513983c..69646fd1bd 100644
--- a/src/Module/Search/Index.php
+++ b/src/Module/Search/Index.php
@@ -7,7 +7,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index 6c6b341fac..431781758b 100644
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -7,7 +7,6 @@
 namespace Friendica\Module\Security;
 
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Module/Tos.php b/src/Module/Tos.php
index 05af490da6..b907b76966 100644
--- a/src/Module/Tos.php
+++ b/src/Module/Tos.php
@@ -9,7 +9,6 @@
 namespace Friendica\Module;
 
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Content\Text\BBCode;
 use Friendica\DI;
diff --git a/src/Network/FKOAuthDataStore.php b/src/Network/FKOAuthDataStore.php
index ff639adf27..cc41d4c6d5 100644
--- a/src/Network/FKOAuthDataStore.php
+++ b/src/Network/FKOAuthDataStore.php
@@ -9,7 +9,6 @@
 
 namespace Friendica\Network;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 7f6c4d0448..4cd32b91ae 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -12,7 +12,6 @@ namespace Friendica\Network;
 use DOMDocument;
 use DomXPath;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/src/Object/Image.php b/src/Object/Image.php
index 9b725eab75..c3585d7cd2 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -6,7 +6,6 @@
 namespace Friendica\Object;
 
 use Exception;
-use Friendica\Core\Config;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Util\Images;
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 5d3ed67a9f..d762420551 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -7,7 +7,6 @@ namespace Friendica\Object;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 53995fdde6..0d6991c072 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -6,7 +6,6 @@ namespace Friendica\Protocol\ActivityPub;
 
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index adb38e8432..c9d39dede7 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -8,7 +8,6 @@ use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index fe362839f3..f649df558f 100644
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -14,7 +14,6 @@ use Friendica\App\BaseURL;
 use Friendica\Content\OEmbed;
 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/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 31c7ccf21c..3b946e702b 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -14,7 +14,6 @@ use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index f75b60f0d1..225c2ec2b4 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -9,7 +9,6 @@ use DOMXPath;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 138c39f5a7..58b9d73874 100644
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -9,26 +9,18 @@
 
 namespace Friendica\Protocol;
 
-use DOMDocument;
-use DOMXPath;
 use Exception;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
-use Friendica\Model\Profile;
-use Friendica\Module\Register;
-use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
-use Friendica\Util\XML;
 
 class PortableContact
 {
diff --git a/src/Util/Crypto.php b/src/Util/Crypto.php
index 628b45f89b..3ac1c3b231 100644
--- a/src/Util/Crypto.php
+++ b/src/Util/Crypto.php
@@ -6,7 +6,6 @@ namespace Friendica\Util;
 
 use ASN_BASE;
 use ASNValue;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index efd5958776..41835b6609 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Util;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\DI;
diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index 7d118d26ca..22ac0203f7 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -34,7 +34,6 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core\Config;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index 48ed2846e8..a4b84f3368 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -6,7 +6,6 @@
 namespace Friendica\Util;
 
 use Friendica\Database\DBA;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Model\User;
diff --git a/src/Util/Network.php b/src/Util/Network.php
index bc0556e893..e2cfc3e849 100644
--- a/src/Util/Network.php
+++ b/src/Util/Network.php
@@ -6,7 +6,6 @@ namespace Friendica\Util;
 
 use DOMDocument;
 use DomXPath;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index c402884333..6bc227591d 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core\Config;
 use Friendica\DI;
 
 /**
diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php
index 4ece4cb9b3..bdd44a300e 100644
--- a/src/Worker/CheckVersion.php
+++ b/src/Worker/CheckVersion.php
@@ -7,7 +7,6 @@
  **/
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 559085be24..763aa98f34 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -5,7 +5,6 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
diff --git a/src/Worker/CronJobs.php b/src/Worker/CronJobs.php
index 48b4923c76..83c85fa440 100644
--- a/src/Worker/CronJobs.php
+++ b/src/Worker/CronJobs.php
@@ -5,10 +5,8 @@
 namespace Friendica\Worker;
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\StorageManager;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Database\PostUpdate;
diff --git a/src/Worker/DBClean.php b/src/Worker/DBClean.php
index 402a70d06f..04fe09faad 100644
--- a/src/Worker/DBClean.php
+++ b/src/Worker/DBClean.php
@@ -6,7 +6,6 @@
 
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/src/Worker/DBUpdate.php b/src/Worker/DBUpdate.php
index 83c9fd3232..e0ab07540c 100644
--- a/src/Worker/DBUpdate.php
+++ b/src/Worker/DBUpdate.php
@@ -5,7 +5,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Update;
 use Friendica\DI;
 
diff --git a/src/Worker/Delivery.php b/src/Worker/Delivery.php
index 19035ac0a3..f864200a31 100644
--- a/src/Worker/Delivery.php
+++ b/src/Worker/Delivery.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/src/Worker/Directory.php b/src/Worker/Directory.php
index 88a11a321c..4d5393dd84 100644
--- a/src/Worker/Directory.php
+++ b/src/Worker/Directory.php
@@ -6,7 +6,6 @@
 
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
diff --git a/src/Worker/Expire.php b/src/Worker/Expire.php
index 153e743087..908eea3ac9 100644
--- a/src/Worker/Expire.php
+++ b/src/Worker/Expire.php
@@ -6,7 +6,6 @@
 
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Worker;
diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index 5585546ce8..d8c424ed03 100644
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
@@ -24,7 +23,6 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
-use Friendica\Util\ACLFormatter;
 
 require_once 'include/items.php';
 
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 812fa36262..8dbb9a4736 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
diff --git a/src/Worker/SearchDirectory.php b/src/Worker/SearchDirectory.php
index 9bae4443fc..cf4ddc609e 100644
--- a/src/Worker/SearchDirectory.php
+++ b/src/Worker/SearchDirectory.php
@@ -5,7 +5,6 @@
 namespace Friendica\Worker;
 
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Search;
diff --git a/src/Worker/UpdateGContacts.php b/src/Worker/UpdateGContacts.php
index 98ec56c484..72136ec0a3 100644
--- a/src/Worker/UpdateGContacts.php
+++ b/src/Worker/UpdateGContacts.php
@@ -4,7 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Worker;
diff --git a/src/Worker/UpdateServerDirectories.php b/src/Worker/UpdateServerDirectories.php
index b6b4cb7b34..d00a6f6c9c 100644
--- a/src/Worker/UpdateServerDirectories.php
+++ b/src/Worker/UpdateServerDirectories.php
@@ -4,8 +4,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
-use Friendica\Core\Logger;
 use Friendica\DI;
 use Friendica\Model\GContact;
 use Friendica\Model\GServer;
diff --git a/tests/src/Database/DBATest.php b/tests/src/Database/DBATest.php
index 60008d0db0..aea03e76a2 100644
--- a/tests/src/Database/DBATest.php
+++ b/tests/src/Database/DBATest.php
@@ -2,7 +2,6 @@
 namespace Friendica\Test\src\Database;
 
 use Dice\Dice;
-use Friendica\Core\Config;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/update.php b/update.php
index a038edf210..4d12730fab 100644
--- a/update.php
+++ b/update.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index 652cea9574..7d2c3f4256 100644
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index a3edf813cb..47944ec587 100644
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -2,7 +2,6 @@
 /**
  * @file view/theme/duepuntozero/style.php
  */
-use Friendica\Core\Config;
 use Friendica\DI;
 
 if (file_exists("$THEMEPATH/style.css")) {
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 051ca88db1..8548899a7d 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 2e76ae261c..d0d1c8cb73 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 6d86eac91c..451fdfc5e4 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -7,7 +7,6 @@
 <!DOCTYPE html >
 <?php
 
-use Friendica\Core\Config;
 use Friendica\DI;
 use Friendica\Model\Profile;
 
diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index ed501c8f18..09312897f6 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -3,7 +3,6 @@
  * @file view/theme/frio/style.php
  */
 
-use Friendica\Core\Config;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 784744427a..7e370edc0e 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Content\Text\Plaintext;
 use Friendica\Content\Widget;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index 459a0d7f40..64284eaa06 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index b282baf88f..27718da6d2 100644
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -2,7 +2,6 @@
 /**
  * @file view/theme/quattro/style.php
  */
-use Friendica\Core\Config;
 use Friendica\DI;
 
 $uid = $_REQUEST['puid'] ?? 0;
diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 2d185be2c8..5891aa32f4 100644
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 9231a9016e..de58042fac 100644
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -3,7 +3,6 @@
  * @file view/theme/vier/style.php
  */
 use Friendica\Core\Logger;
-use Friendica\Core\Config;
 use Friendica\DI;
 
 $uid = $_REQUEST['puid'] ?? 0;
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 8c1f566671..d4bdc6e313 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -12,7 +12,6 @@
 use Friendica\App;
 use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
-use Friendica\Core\Config;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;