diff --git a/blockem/blockem.php b/blockem/blockem.php
index 80bf83854..235381fa8 100644
--- a/blockem/blockem.php
+++ b/blockem/blockem.php
@@ -10,7 +10,6 @@
 use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/blogger/blogger.php b/blogger/blogger.php
index 847bcea89..18a1b8eac 100644
--- a/blogger/blogger.php
+++ b/blogger/blogger.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
diff --git a/buffer/buffer.php b/buffer/buffer.php
index 2e2970752..667eac309 100644
--- a/buffer/buffer.php
+++ b/buffer/buffer.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\Renderer;
 use Friendica\Database\DBA;
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 8baf04579..49c6cc423 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.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\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/curweather/curweather.php b/curweather/curweather.php
index 460a148f5..6b6f8e902 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -10,11 +10,9 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Cache;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\DI;
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index e33b7fde8..bf3cae2b9 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -14,8 +14,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\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
 use Friendica\DI;
diff --git a/discourse/discourse.php b/discourse/discourse.php
index 7bb75edae..f53db17cf 100644
--- a/discourse/discourse.php
+++ b/discourse/discourse.php
@@ -11,13 +11,11 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Util\XML;
 use Friendica\Content\Text\Markdown;
 use Friendica\Util\Network;
 use Friendica\Util\Strings;
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 875676652..975d703ed 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -13,7 +13,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 49a3bacf2..a796920d6 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -9,7 +9,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function fromapp_install()
diff --git a/geonames/geonames.php b/geonames/geonames.php
index 15e3339d7..6e2ee95ec 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.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\Renderer;
 use Friendica\DI;
 use Friendica\Util\ConfigFileLoader;
diff --git a/gnot/gnot.php b/gnot/gnot.php
index a3323fdde..128b37dd7 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -10,7 +10,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/group_text/group_text.php b/group_text/group_text.php
index b82c751b2..07ad8102d 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -8,7 +8,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function group_text_install() {
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 44c58739f..58ba1cf9e 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 603c0969a..02770ce06 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -12,7 +12,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
diff --git a/irc/irc.php b/irc/irc.php
index ad4164cbf..bc26ff499 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -10,7 +10,6 @@
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index d3c79c771..84c890645 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -67,7 +67,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\Database\DBA;
 use Friendica\DI;
diff --git a/krynn/krynn.php b/krynn/krynn.php
index 62959bb62..63418ebf2 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -12,7 +12,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function krynn_install() {
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index 0ddd85484..0293e119c 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/libertree/libertree.php b/libertree/libertree.php
index a98419e36..3fa5f90dc 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Network;
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index ab47416f9..457343fc1 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -12,7 +12,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index 3513d5813..d2a31e427 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.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\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/markdown/markdown.php b/markdown/markdown.php
index 854bc6898..ce7553e05 100644
--- a/markdown/markdown.php
+++ b/markdown/markdown.php
@@ -7,10 +7,8 @@
  */
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Logger;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Renderer;
-use Friendica\Core\PConfig;
 use Friendica\Core\L10n;
 use Friendica\DI;
 
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 718a62faf..685a53b29 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -11,7 +11,6 @@
 use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 
diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
index d090b7441..afb30fb5a 100644
--- a/notimeline/notimeline.php
+++ b/notimeline/notimeline.php
@@ -9,7 +9,6 @@
  */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function notimeline_install()
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 4369df408..70a18416a 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -9,7 +9,6 @@
  */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function nsfw_install()
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 773cc6501..1e0609bd7 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -8,7 +8,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function numfriends_install() {
diff --git a/planets/planets.php b/planets/planets.php
index e7a1e9b88..18515694b 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -9,7 +9,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function planets_install() {
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 08a1696bc..92132a98a 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.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\Worker;
 use Friendica\Database\DBA;
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index b4190e2ef..8b67914ce 100644
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -19,7 +19,6 @@
  */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\XML;
 
diff --git a/randplace/randplace.php b/randplace/randplace.php
index f08f85b32..2ffe167ef 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -21,7 +21,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 
 function randplace_install() {
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index 1a457872b..163cdee52 100644
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -10,7 +10,6 @@
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 37e4eef04..fd074b720 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.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\Renderer;
 use Friendica\DI;
 use Friendica\Util\Emailer;
diff --git a/showmore/showmore.php b/showmore/showmore.php
index acd8e33db..9fe3497fa 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -9,7 +9,6 @@
  */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/startpage/startpage.php b/startpage/startpage.php
index 8feb63128..2d1ffd3c8 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -8,8 +8,6 @@
  */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
-use Friendica\Core\System;
 use Friendica\DI;
 
 function startpage_install() {
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index 5eaffc3d9..31dbd3fb6 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -46,7 +46,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\Database\DBA;
diff --git a/superblock/superblock.php b/superblock/superblock.php
index 6b7dae22e..b5a0ea0cf 100644
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -8,7 +8,6 @@
  */
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\DI;
 use Friendica\Util\Strings;
 
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 038237e41..1b618a7ae 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.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\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 25c48a95f..7fe8bd844 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -73,7 +73,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\Worker;
diff --git a/widgets/widgets.php b/widgets/widgets.php
index 35dbfa5e1..d9ecb890c 100644
--- a/widgets/widgets.php
+++ b/widgets/widgets.php
@@ -10,7 +10,6 @@
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index efae2f2e7..1d9dd27d9 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -32,7 +32,6 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
diff --git a/wppost/wppost.php b/wppost/wppost.php
index 12fc19b80..d8d2431f1 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -11,7 +11,6 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Util\Network;
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index 6b962c78b..552f5f9e5 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -11,7 +11,6 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\DI;
 use Friendica\Util\Strings;