diff --git a/mod/amcd.php b/mod/amcd.php
index 31b812ecd..ca5aa07aa 100644
--- a/mod/amcd.php
+++ b/mod/amcd.php
@@ -1,7 +1,5 @@
 <?php
 
-use Friendica\App;
-
 function amcd_content()
 {
 	echo <<< JSON
diff --git a/mod/api.php b/mod/api.php
index 1f199c9a9..466bd7b34 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -6,7 +6,6 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Module\Login;
 
diff --git a/mod/cal.php b/mod/cal.php
index 3d90ff03b..5baffec8a 100644
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -23,7 +23,6 @@ use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
-use Friendica\Util\Security;
 
 function cal_init(App $a)
 {
diff --git a/mod/credits.php b/mod/credits.php
index 56b7cd661..3d71c54b3 100644
--- a/mod/credits.php
+++ b/mod/credits.php
@@ -5,7 +5,7 @@
  * (only contributors to the git repositories for friendica core and the
  * addons repository will be listed though ATM)
  */
-use Friendica\App;
+
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 
diff --git a/mod/delegate.php b/mod/delegate.php
index 4bfc0e31b..b373c2040 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -11,7 +11,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
-use Friendica\Util\Security;
 use Friendica\Util\Strings;
 
 require_once 'mod/settings.php';
diff --git a/mod/fetch.php b/mod/fetch.php
index 1af8d0785..3e9c4e662 100644
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -4,14 +4,12 @@ This file is part of the Diaspora protocol. It is used for fetching single publi
 */
 
 use Friendica\App;
-use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Protocol\Diaspora;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Util\Strings;
-use Friendica\Util\XML;
 use Friendica\Database\DBA;
 
 function fetch_init(App $a)
diff --git a/mod/filerm.php b/mod/filerm.php
index f88c174cb..b1f9f8d74 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -2,7 +2,6 @@
 
 use Friendica\App;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Model\FileTag;
 use Friendica\Util\XML;
 
diff --git a/mod/follow.php b/mod/follow.php
index f8e2539d9..abde4abd0 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -12,7 +12,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Database\DBA;
-use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Strings;
 
 function follow_post(App $a)
diff --git a/mod/group.php b/mod/group.php
index 6a347a809..a6f649bf3 100644
--- a/mod/group.php
+++ b/mod/group.php
@@ -11,11 +11,9 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
-use Friendica\Util\Security;
 use Friendica\Util\Strings;
 
 function group_init(App $a) {
diff --git a/mod/ignored.php b/mod/ignored.php
index e6d9a09d6..e50d183b2 100644
--- a/mod/ignored.php
+++ b/mod/ignored.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
diff --git a/mod/invite.php b/mod/invite.php
index 460a3461d..02415239a 100644
--- a/mod/invite.php
+++ b/mod/invite.php
@@ -13,10 +13,7 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\Protocol\Email;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Security;
 use Friendica\Util\Strings;
 
 function invite_post(App $a)
diff --git a/mod/like.php b/mod/like.php
index 321992008..7fc7b2b42 100644
--- a/mod/like.php
+++ b/mod/like.php
@@ -1,7 +1,6 @@
 <?php
 
 use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Model\Item;
 use Friendica\Util\Strings;
 
diff --git a/mod/nogroup.php b/mod/nogroup.php
index 438c4ff44..20dbd23a3 100644
--- a/mod/nogroup.php
+++ b/mod/nogroup.php
@@ -3,12 +3,7 @@
  * @file mod/nogroup.php
  */
 use Friendica\App;
-use Friendica\Content\ContactSelector;
 use Friendica\Core\L10n;
-use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Group;
-use Friendica\Core\System;
 
 function nogroup_init(App $a)
 {
diff --git a/mod/notice.php b/mod/notice.php
index b40f0ee69..1a584000c 100644
--- a/mod/notice.php
+++ b/mod/notice.php
@@ -6,7 +6,6 @@
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 
 function notice_init(App $a)
diff --git a/mod/openid.php b/mod/openid.php
index 4e247b384..2ae3f6c71 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -8,7 +8,6 @@ use Friendica\Core\Authentication;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\Strings;
 
diff --git a/mod/profile.php b/mod/profile.php
index f7d665334..858748bb8 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -11,6 +11,7 @@ use Friendica\Core\ACL;
 use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
+use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 0f1fc159a..b802050b6 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -15,7 +15,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
-use Friendica\Util\Security;
 use Friendica\Util\Strings;
 
 function profile_photo_init(App $a)
diff --git a/mod/randprof.php b/mod/randprof.php
index d0b3c4ef8..10bff588e 100644
--- a/mod/randprof.php
+++ b/mod/randprof.php
@@ -3,10 +3,8 @@
  * @file mod/randprof.php
  */
 use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Profile;
 
 function randprof_init(App $a)
 {
diff --git a/mod/redir.php b/mod/redir.php
index 33b7d36f9..4dbae5498 100644
--- a/mod/redir.php
+++ b/mod/redir.php
@@ -3,7 +3,6 @@
 use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
diff --git a/mod/removeme.php b/mod/removeme.php
index 741a67598..7ed0d1da9 100644
--- a/mod/removeme.php
+++ b/mod/removeme.php
@@ -7,7 +7,6 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Util\Strings;
diff --git a/mod/search.php b/mod/search.php
index 3864f1488..9a70bcac9 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -4,7 +4,6 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\HTML;
diff --git a/mod/starred.php b/mod/starred.php
index 1462513de..0705d5436 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -3,7 +3,6 @@
  * @file mod/starred.php
  */
 use Friendica\App;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
 
diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 9d2a7e22e..67bc5e3ba 100644
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -8,6 +8,7 @@ namespace Friendica\Core;
 use Exception;
 use Friendica\BaseObject;
 use Friendica\Render\FriendicaSmarty;
+use Friendica\Render\ITemplateEngine;
 
 /**
  * @brief This class handles Renderer related functions.