diff --git a/mod/cal.php b/mod/cal.php
index 9329aac32..4c22232d2 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -27,7 +27,6 @@ use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/display.php b/mod/display.php
index a2bf21867..d04b878c4 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -24,7 +24,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/editpost.php b/mod/editpost.php
index 0c0002bc5..bec5d3449 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -23,7 +23,6 @@ use Friendica\App;
 use Friendica\Content\Feature;
 use Friendica\Core\Hook;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/events.php b/mod/events.php
index 5899302cc..b87120672 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -27,7 +27,6 @@ use Friendica\Core\ACL;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
diff --git a/mod/fbrowser.php b/mod/fbrowser.php
index 137d664f3..952ab1452 100644
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@@ -24,7 +24,6 @@
 
 use Friendica\App;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/follow.php b/mod/follow.php
index 19e55123c..db7a52b2c 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -23,7 +23,6 @@ use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
diff --git a/mod/item.php b/mod/item.php
index 0490e43a8..f30798fa3 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -34,7 +34,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/mod/match.php b/mod/match.php
index 5b87c6870..e8a0a6605 100644
--- a/mod/match.php
+++ b/mod/match.php
@@ -23,7 +23,6 @@ use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/message.php b/mod/message.php
index 9fb8d7cbc..794d2ace4 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -25,7 +25,6 @@ use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\ACL;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/notes.php b/mod/notes.php
index 84c0711eb..39649d81f 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
diff --git a/mod/oexchange.php b/mod/oexchange.php
index 4bc25e6fd..dd3809bc7 100644
--- a/mod/oexchange.php
+++ b/mod/oexchange.php
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\DI;
 use Friendica\Module\Response;
diff --git a/mod/ostatus_subscribe.php b/mod/ostatus_subscribe.php
index 31564ad32..5344ed845 100644
--- a/mod/ostatus_subscribe.php
+++ b/mod/ostatus_subscribe.php
@@ -21,7 +21,6 @@
 
 use Friendica\App;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Model\APContact;
 use Friendica\Model\Contact;
diff --git a/mod/photos.php b/mod/photos.php
index 56b722e8f..2d7516be9 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -30,7 +30,6 @@ use Friendica\Core\Addon;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/redir.php b/mod/redir.php
index afdb20d48..cc4dc1c0c 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -21,7 +21,6 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/removeme.php b/mod/removeme.php
index f962ed07d..da946485d 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -21,7 +21,6 @@
 
 use Friendica\App;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
diff --git a/mod/repair_ostatus.php b/mod/repair_ostatus.php
index 686516a55..cc7eecde2 100644
--- a/mod/repair_ostatus.php
+++ b/mod/repair_ostatus.php
@@ -21,7 +21,6 @@
 
 use Friendica\App;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/settings.php b/mod/settings.php
index e24127cbb..1de3f5dcf 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -26,7 +26,6 @@ use Friendica\Content\Nav;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Item;
diff --git a/mod/share.php b/mod/share.php
index e7d12ab27..01ef85503 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -21,7 +21,6 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/suggest.php b/mod/suggest.php
index 19d36735c..9ad11f745 100644
--- a/mod/suggest.php
+++ b/mod/suggest.php
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/tagger.php b/mod/tagger.php
index 05a9418f6..dae9cbc2b 100644
--- a/mod/tagger.php
+++ b/mod/tagger.php
@@ -22,7 +22,6 @@
 use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
diff --git a/mod/tagrm.php b/mod/tagrm.php
index 197650bfa..26d2c905f 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -21,7 +21,6 @@
 
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Post;
diff --git a/mod/unfollow.php b/mod/unfollow.php
index 04e487936..8431d04d0 100644
--- a/mod/unfollow.php
+++ b/mod/unfollow.php
@@ -23,7 +23,6 @@ use Friendica\App;
 use Friendica\Content\Widget;
 use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
diff --git a/mod/update_contact.php b/mod/update_contact.php
index 17fa2b7f8..c6a49a417 100644
--- a/mod/update_contact.php
+++ b/mod/update_contact.php
@@ -22,7 +22,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 402348c4b..83d5338da 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -20,7 +20,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index c5ac89dc4..c5575da97 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -27,7 +27,6 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
-use Friendica\Core\Session;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;