diff --git a/boot.php b/boot.php
index cb3ff7f85..c863cda72 100644
--- a/boot.php
+++ b/boot.php
@@ -17,9 +17,7 @@
  * easily as email does today.
  */
 
-use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/include/api.php b/include/api.php
index d5b52e89c..8220e7bb1 100644
--- a/include/api.php
+++ b/include/api.php
@@ -15,7 +15,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Session;
 use Friendica\Core\System;
diff --git a/include/conversation.php b/include/conversation.php
index e617a1db2..5c1b140f4 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -12,7 +12,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/mod/community.php b/mod/community.php
index 6c7037f54..8ed0c14dc 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -11,7 +11,6 @@ use Friendica\Content\Widget\TrendingTags;
 use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
diff --git a/mod/network.php b/mod/network.php
index 28d849e7a..d4e371c15 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -16,7 +16,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 0ab39e0c8..f6d826e85 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/ping.php b/mod/ping.php
index 8530c339e..c25d7d62e 100644
--- a/mod/ping.php
+++ b/mod/ping.php
@@ -10,7 +10,6 @@ use Friendica\Core\Cache\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/profiles.php b/mod/profiles.php
index 9c394b33b..f333e302f 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -11,7 +11,6 @@ use Friendica\Content\Nav;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/mod/profperm.php b/mod/profperm.php
index 0377a5f1b..a79358c81 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -5,7 +5,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Content\Text\HTML;
 use Friendica\Database\DBA;
diff --git a/mod/salmon.php b/mod/salmon.php
index 5aa57a892..c7b25a665 100644
--- a/mod/salmon.php
+++ b/mod/salmon.php
@@ -5,7 +5,6 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/settings.php b/mod/settings.php
index 2713b35df..8213fda7c 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -12,7 +12,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Core\Theme;
diff --git a/mod/update_display.php b/mod/update_display.php
index bfd8cdab8..569c76ab3 100644
--- a/mod/update_display.php
+++ b/mod/update_display.php
@@ -6,7 +6,6 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 require_once "mod/display.php";
diff --git a/mod/update_network.php b/mod/update_network.php
index 3a4922768..2ae9ccb78 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -6,7 +6,6 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 require_once "mod/network.php";
diff --git a/mod/update_notes.php b/mod/update_notes.php
index 1769fac76..989af976a 100644
--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@@ -7,7 +7,6 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 require_once("mod/notes.php");
diff --git a/mod/update_profile.php b/mod/update_profile.php
index 20f02a297..38802866d 100644
--- a/mod/update_profile.php
+++ b/mod/update_profile.php
@@ -7,7 +7,6 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Module\Profile;
 
diff --git a/src/Content/Feature.php b/src/Content/Feature.php
index 6b39ec4c9..995f33292 100644
--- a/src/Content/Feature.php
+++ b/src/Content/Feature.php
@@ -8,7 +8,6 @@ namespace Friendica\Content;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 class Feature
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index c5943fc89..cafc6f314 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -16,7 +16,6 @@ namespace Friendica\Content;
 
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index ebf61177d..74955be02 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -7,7 +7,6 @@ namespace Friendica\Content;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Content/Widget/ContactBlock.php b/src/Content/Widget/ContactBlock.php
index e4bf8e7ea..bd4d10fd3 100644
--- a/src/Content/Widget/ContactBlock.php
+++ b/src/Content/Widget/ContactBlock.php
@@ -9,7 +9,6 @@ namespace Friendica\Content\Widget;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
deleted file mode 100644
index bb3334c4c..000000000
--- a/src/Core/PConfig.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * User Configuration Class
- *
- * @file include/Core/PConfig.php
- *
- * @brief Contains the class with methods for user configuration
- */
-namespace Friendica\Core;
-
-use Friendica\DI;
-
-/**
- * @brief Management of user configuration storage
- * Note:
- * Please do not store booleans - convert to 0/1 integer values
- * The DI::pConfig()->get() functions return boolean false for keys that are unset,
- * and this could lead to subtle bugs.
- */
-class PConfig
-{
-}
diff --git a/src/Model/Event.php b/src/Model/Event.php
index 85ac2e3eb..48544b06d 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -9,7 +9,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index f52bda0ad..ffcea7e28 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -6,7 +6,6 @@
 namespace Friendica\Model;
 
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 8ed746634..94fe567f6 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -11,9 +11,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\Lock;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Model/ItemContent.php b/src/Model/ItemContent.php
index ab7248417..672631b7e 100644
--- a/src/Model/ItemContent.php
+++ b/src/Model/ItemContent.php
@@ -7,7 +7,6 @@
 namespace Friendica\Model;
 
 use Friendica\Content\Text;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\DI;
 
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index d3298bbfb..53699d783 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -15,7 +15,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Model/User.php b/src/Model/User.php
index a6acbc679..f19ebc03c 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -13,7 +13,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
diff --git a/src/Module/Filer/SaveTag.php b/src/Module/Filer/SaveTag.php
index 1c3c3af88..0b6a41ae2 100644
--- a/src/Module/Filer/SaveTag.php
+++ b/src/Module/Filer/SaveTag.php
@@ -4,7 +4,6 @@ namespace Friendica\Module\Filer;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model;
diff --git a/src/Module/Group.php b/src/Module/Group.php
index 7796d482f..6542cc74a 100644
--- a/src/Module/Group.php
+++ b/src/Module/Group.php
@@ -8,7 +8,6 @@ namespace Friendica\Module;
 use Friendica\BaseModule;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/src/Module/Invite.php b/src/Module/Invite.php
index c84795abb..b06efc5a2 100644
--- a/src/Module/Invite.php
+++ b/src/Module/Invite.php
@@ -4,7 +4,6 @@ namespace Friendica\Module;
 
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model;
diff --git a/src/Module/Profile.php b/src/Module/Profile.php
index 3c2001aa2..3dc35cb2d 100644
--- a/src/Module/Profile.php
+++ b/src/Module/Profile.php
@@ -10,19 +10,15 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact as ContactModel;
-use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile as ProfileModel;
 use Friendica\Model\User;
 use Friendica\Module\Security\Login;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Security;
 use Friendica\Util\Strings;
diff --git a/src/Module/Register.php b/src/Module/Register.php
index e791bf393..934106115 100644
--- a/src/Module/Register.php
+++ b/src/Module/Register.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Module;
 
-use Friendica\App\BaseURL;
 use Friendica\BaseModule;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Config;
@@ -10,7 +9,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\L10n\L10n as L10nClass;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/src/Module/Security/TwoFactor/Verify.php b/src/Module/Security/TwoFactor/Verify.php
index e1a2bc8a1..c00c8abe5 100644
--- a/src/Module/Security/TwoFactor/Verify.php
+++ b/src/Module/Security/TwoFactor/Verify.php
@@ -3,9 +3,7 @@
 namespace Friendica\Module\Security\TwoFactor;
 
 use Friendica\BaseModule;
-use Friendica\App\Authentication;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
diff --git a/src/Module/Settings/TwoFactor/AppSpecific.php b/src/Module/Settings/TwoFactor/AppSpecific.php
index 4c1f0ab46..d87247346 100644
--- a/src/Module/Settings/TwoFactor/AppSpecific.php
+++ b/src/Module/Settings/TwoFactor/AppSpecific.php
@@ -1,11 +1,8 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\TwoFactor\AppSpecificPassword;
diff --git a/src/Module/Settings/TwoFactor/Index.php b/src/Module/Settings/TwoFactor/Index.php
index 26d40565f..df06333fc 100644
--- a/src/Module/Settings/TwoFactor/Index.php
+++ b/src/Module/Settings/TwoFactor/Index.php
@@ -1,11 +1,8 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
diff --git a/src/Module/Settings/TwoFactor/Recovery.php b/src/Module/Settings/TwoFactor/Recovery.php
index ad486c5c6..604eca480 100644
--- a/src/Module/Settings/TwoFactor/Recovery.php
+++ b/src/Module/Settings/TwoFactor/Recovery.php
@@ -1,11 +1,8 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Model\TwoFactor\RecoveryCode;
diff --git a/src/Module/Settings/TwoFactor/Verify.php b/src/Module/Settings/TwoFactor/Verify.php
index 6b3abe9a7..8371064c3 100644
--- a/src/Module/Settings/TwoFactor/Verify.php
+++ b/src/Module/Settings/TwoFactor/Verify.php
@@ -1,16 +1,12 @@
 <?php
 
-
 namespace Friendica\Module\Settings\TwoFactor;
 
-
 use BaconQrCode\Renderer\Image\SvgImageBackEnd;
 use BaconQrCode\Renderer\ImageRenderer;
 use BaconQrCode\Renderer\RendererStyle\RendererStyle;
 use BaconQrCode\Writer;
-use Friendica\BaseModule;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 3cdfebf33..2df5e9a36 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -11,7 +11,6 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index bc4fc491c..89abac6c9 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -8,7 +8,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index d5e247267..eaa62b49e 100644
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -17,7 +17,6 @@ use Friendica\Core\Cache\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php
index e1bf8a823..20dd058fc 100644
--- a/src/Protocol/OStatus.php
+++ b/src/Protocol/OStatus.php
@@ -11,9 +11,7 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Cache\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\Lock;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/src/Util/Emailer.php b/src/Util/Emailer.php
index 2bed3858c..0da917033 100644
--- a/src/Util/Emailer.php
+++ b/src/Util/Emailer.php
@@ -7,7 +7,6 @@ namespace Friendica\Util;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Protocol\Email;
 
 /**
diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index e4dd1f23f..9644bf9d1 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -35,7 +35,6 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index f1e34acdf..b19bfa05b 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -9,7 +9,6 @@ namespace Friendica\Util;
 use DateTime;
 use DateTimeZone;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 
diff --git a/src/Worker/OnePoll.php b/src/Worker/OnePoll.php
index 32e304cbd..0d12e40d9 100644
--- a/src/Worker/OnePoll.php
+++ b/src/Worker/OnePoll.php
@@ -6,7 +6,6 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/update.php b/update.php
index 0e69f9094..6c902ab85 100644
--- a/update.php
+++ b/update.php
@@ -4,7 +4,6 @@ use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php
index 188cbe5f7..574e25648 100644
--- a/view/theme/duepuntozero/config.php
+++ b/view/theme/duepuntozero/config.php
@@ -6,7 +6,6 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php
index 39a0f694a..189d5ac40 100644
--- a/view/theme/duepuntozero/style.php
+++ b/view/theme/duepuntozero/style.php
@@ -3,9 +3,7 @@
  * @file view/theme/duepuntozero/style.php
  */
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\DI;
-use Friendica\Model\Profile;
 
 if (file_exists("$THEMEPATH/style.css")) {
 	echo file_get_contents("$THEMEPATH/style.css");
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index fba19d0dd..77eb38e8a 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -2,7 +2,6 @@
 
 use Friendica\App;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php
index 8dcdb84ed..899cbfbc1 100644
--- a/view/theme/frio/config.php
+++ b/view/theme/frio/config.php
@@ -3,9 +3,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\DI;
 
 require_once 'view/theme/frio/php/Image.php';
diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php
index 7dc765f0e..b23944d12 100644
--- a/view/theme/frio/php/default.php
+++ b/view/theme/frio/php/default.php
@@ -8,8 +8,6 @@
 <?php
 
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Model\Profile;
 
diff --git a/view/theme/frio/php/scheme.php b/view/theme/frio/php/scheme.php
index 48a8e9144..56e55a015 100644
--- a/view/theme/frio/php/scheme.php
+++ b/view/theme/frio/php/scheme.php
@@ -18,7 +18,6 @@
  *    'overwrites' => Variables which overwriting custom settings
  */
 
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/view/theme/frio/style.php b/view/theme/frio/style.php
index 9a929317f..363f7cd44 100644
--- a/view/theme/frio/style.php
+++ b/view/theme/frio/style.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php
index ce9354481..eb6c5d0aa 100644
--- a/view/theme/quattro/config.php
+++ b/view/theme/quattro/config.php
@@ -6,9 +6,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\DI;
 
 function theme_content(App $a) {
diff --git a/view/theme/quattro/style.php b/view/theme/quattro/style.php
index 1c0209fdf..f028e11e1 100644
--- a/view/theme/quattro/style.php
+++ b/view/theme/quattro/style.php
@@ -3,9 +3,7 @@
  * @file view/theme/quattro/style.php
  */
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\DI;
-use Friendica\Model\Profile;
 
 $uid = $_REQUEST['puid'] ?? 0;
 
diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php
index 106303b92..9bcf4cffc 100644
--- a/view/theme/vier/config.php
+++ b/view/theme/vier/config.php
@@ -6,9 +6,7 @@
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\DI;
 
 require_once __DIR__ . '/theme.php';
diff --git a/view/theme/vier/style.php b/view/theme/vier/style.php
index 8f2502627..f8068646c 100644
--- a/view/theme/vier/style.php
+++ b/view/theme/vier/style.php
@@ -4,9 +4,7 @@
  */
 use Friendica\Core\Logger;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\DI;
-use Friendica\Model\Profile;
 
 $uid = $_REQUEST['puid'] ?? 0;
 
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index 06e43a129..e7318902a 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -14,7 +14,6 @@ use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
 use Friendica\Database\DBA;