From cb3f09ae4f344ff83fca9dc435f3cbad1972737f Mon Sep 17 00:00:00 2001
From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 6 Jan 2019 16:28:14 -0500
Subject: [PATCH] Refactor namespaces

- Remove unused use statements
- Add required use statements
- Escape global classes
---
 src/App.php                                | 1 -
 src/Content/ForumManager.php               | 1 -
 src/Content/Text/Markdown.php              | 1 -
 src/Content/Widget.php                     | 2 --
 src/Content/Widget/TagCloud.php            | 1 -
 src/Core/Cache/MemcachedCacheDriver.php    | 1 -
 src/Core/Config.php                        | 1 -
 src/Core/Console/ArchiveContact.php        | 1 -
 src/Core/Console/AutomaticInstallation.php | 2 --
 src/Core/Installer.php                     | 1 -
 src/Core/Lock.php                          | 5 ++---
 src/Core/NotificationsManager.php          | 2 --
 src/Core/Renderer.php                      | 1 -
 src/Core/StorageManager.php                | 3 ---
 src/Core/System.php                        | 2 --
 src/Core/Theme.php                         | 4 ++--
 src/Core/UserImport.php                    | 3 ---
 src/Database/PostUpdate.php                | 1 -
 src/LegacyModule.php                       | 2 +-
 src/Model/FileTag.php                      | 1 -
 src/Model/Group.php                        | 1 -
 src/Model/Item.php                         | 9 ---------
 src/Model/Mail.php                         | 1 -
 src/Model/Photo.php                        | 2 +-
 src/Model/Profile.php                      | 1 -
 src/Model/Storage/Database.php             | 1 -
 src/Model/User.php                         | 1 -
 src/Module/Contact.php                     | 1 -
 src/Module/Inbox.php                       | 1 -
 src/Module/Install.php                     | 2 --
 src/Module/Photo.php                       | 4 ----
 src/Module/Proxy.php                       | 4 ----
 src/Object/Image.php                       | 1 -
 src/Object/Post.php                        | 1 -
 src/Object/Thread.php                      | 1 -
 src/Protocol/ActivityPub.php               | 1 +
 src/Protocol/ActivityPub/Processor.php     | 1 -
 src/Protocol/ActivityPub/Transmitter.php   | 1 -
 src/Protocol/Email.php                     | 1 -
 src/Util/HTTPSignature.php                 | 4 ----
 src/Util/LDSignature.php                   | 3 ---
 src/Util/Proxy.php                         | 2 --
 src/Util/Security.php                      | 3 ---
 src/Util/Temporal.php                      | 1 -
 src/Worker/APDelivery.php                  | 1 -
 src/Worker/DBUpdate.php                    | 1 -
 src/Worker/PubSubPublish.php               | 1 -
 src/Worker/SpoolPost.php                   | 1 -
 48 files changed, 7 insertions(+), 81 deletions(-)

diff --git a/src/App.php b/src/App.php
index e30cc92120..6421a4c212 100644
--- a/src/App.php
+++ b/src/App.php
@@ -8,7 +8,6 @@ use Detection\MobileDetect;
 use DOMDocument;
 use DOMXPath;
 use Exception;
-use Friendica\Core\Logger;
 use Friendica\Database\DBA;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Psr\Log\LoggerInterface;
diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 11847383fe..d39ea30294 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -6,7 +6,6 @@
 namespace Friendica\Content;
 
 use Friendica\Core\Protocol;
-use Friendica\Content\Feature;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
diff --git a/src/Content/Text/Markdown.php b/src/Content/Text/Markdown.php
index bf95e1a934..e54234bffe 100644
--- a/src/Content/Text/Markdown.php
+++ b/src/Content/Text/Markdown.php
@@ -9,7 +9,6 @@ namespace Friendica\Content\Text;
 use Friendica\BaseObject;
 use Friendica\Model\Contact;
 use Michelf\MarkdownExtra;
-use Friendica\Content\Text\HTML;
 
 /**
  * Friendica-specific usage of Markdown
diff --git a/src/Content/Widget.php b/src/Content/Widget.php
index 3c3af4f6ac..b7fa5ab4e8 100644
--- a/src/Content/Widget.php
+++ b/src/Content/Widget.php
@@ -4,8 +4,6 @@
  */
 namespace Friendica\Content;
 
-use Friendica\Content\ContactSelector;
-use Friendica\Content\Feature;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
diff --git a/src/Content/Widget/TagCloud.php b/src/Content/Widget/TagCloud.php
index e1ce921c04..d775d010a8 100644
--- a/src/Content/Widget/TagCloud.php
+++ b/src/Content/Widget/TagCloud.php
@@ -11,7 +11,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Item;
-use Friendica\Util\Security;
 
 /**
  * TagCloud widget
diff --git a/src/Core/Cache/MemcachedCacheDriver.php b/src/Core/Cache/MemcachedCacheDriver.php
index 6453c307ce..687e67416a 100644
--- a/src/Core/Cache/MemcachedCacheDriver.php
+++ b/src/Core/Cache/MemcachedCacheDriver.php
@@ -6,7 +6,6 @@ use Friendica\Core\Cache;
 use Friendica\Core\Logger;
 
 use Exception;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 use Memcached;
 
 /**
diff --git a/src/Core/Config.php b/src/Core/Config.php
index fad50c0cb4..755dc6ebbc 100644
--- a/src/Core/Config.php
+++ b/src/Core/Config.php
@@ -10,7 +10,6 @@ namespace Friendica\Core;
 
 use Friendica\App;
 use Friendica\BaseObject;
-use Friendica\Core\Config;
 
 /**
  * @brief Arbitrary system configuration storage
diff --git a/src/Core/Console/ArchiveContact.php b/src/Core/Console/ArchiveContact.php
index ffcd5a1658..27de85901e 100644
--- a/src/Core/Console/ArchiveContact.php
+++ b/src/Core/Console/ArchiveContact.php
@@ -2,7 +2,6 @@
 
 namespace Friendica\Core\Console;
 
-use Friendica\App;
 use Friendica\Core\L10n;
 use Friendica\Database\DBA;
 use Friendica\Util\Strings;
diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index 7db2cc3e70..c38dab9806 100644
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -7,8 +7,6 @@ use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\Installer;
 use Friendica\Core\Theme;
-use Friendica\Database\DBA;
-use Friendica\Database\DBStructure;
 use RuntimeException;
 
 class AutomaticInstallation extends Console
diff --git a/src/Core/Installer.php b/src/Core/Installer.php
index 6ea3d553cf..cf5dd9ffc2 100644
--- a/src/Core/Installer.php
+++ b/src/Core/Installer.php
@@ -6,7 +6,6 @@ namespace Friendica\Core;
 
 use DOMDocument;
 use Exception;
-use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\Object\Image;
diff --git a/src/Core/Lock.php b/src/Core/Lock.php
index 91c444253a..e8c8a70416 100644
--- a/src/Core/Lock.php
+++ b/src/Core/Lock.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace Friendica\Core;
-
 /**
  * @file src/Core/Lock.php
  * @brief Functions for preventing parallel execution of functions
  */
 
-use Friendica\Core\Logger;
+namespace Friendica\Core;
+
 use Friendica\Core\Cache\CacheDriverFactory;
 use Friendica\Core\Cache\IMemoryCacheDriver;
 
diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 756a5ceb4b..566b701748 100644
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -9,8 +9,6 @@ namespace Friendica\Core;
 use Friendica\BaseObject;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php
index 7e4436b1e3..9d2a7e22e5 100644
--- a/src/Core/Renderer.php
+++ b/src/Core/Renderer.php
@@ -7,7 +7,6 @@ namespace Friendica\Core;
 
 use Exception;
 use Friendica\BaseObject;
-use Friendica\Core\System;
 use Friendica\Render\FriendicaSmarty;
 
 /**
diff --git a/src/Core/StorageManager.php b/src/Core/StorageManager.php
index f46740ec63..932b4bb400 100644
--- a/src/Core/StorageManager.php
+++ b/src/Core/StorageManager.php
@@ -3,9 +3,6 @@
 namespace Friendica\Core;
 
 use Friendica\Database\DBA;
-use Friendica\Core\Config;
-use Friendica\Core\Logger;
-
 
 
 /**
diff --git a/src/Core/System.php b/src/Core/System.php
index 44419ad179..81c537169e 100644
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -5,8 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\XML;
 
diff --git a/src/Core/Theme.php b/src/Core/Theme.php
index 4ceff23232..62dfaa51f3 100644
--- a/src/Core/Theme.php
+++ b/src/Core/Theme.php
@@ -7,10 +7,10 @@
 namespace Friendica\Core;
 
 use Friendica\BaseObject;
-use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Model\Profile;
 
+require_once 'boot.php';
+
 /**
  * Some functions to handle themes
  */
diff --git a/src/Core/UserImport.php b/src/Core/UserImport.php
index 6cefae556f..1e103c1f5d 100644
--- a/src/Core/UserImport.php
+++ b/src/Core/UserImport.php
@@ -5,9 +5,6 @@
 namespace Friendica\Core;
 
 use Friendica\App;
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index a5bdcdeadd..c40bfc98e7 100644
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -11,7 +11,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
 use Friendica\Model\PermissionSet;
-use Friendica\Database\DBA;
 
 /**
  * Post update functions
diff --git a/src/LegacyModule.php b/src/LegacyModule.php
index 209dc8f3e1..a0b23a5419 100644
--- a/src/LegacyModule.php
+++ b/src/LegacyModule.php
@@ -27,7 +27,7 @@ class LegacyModule extends BaseModule
 	public static function setModuleFile($file_path)
 	{
 		if (!is_readable($file_path)) {
-			throw new Exception(Core\L10n::t('Legacy module file not found: %s', $file_path));
+			throw new \Exception(Core\L10n::t('Legacy module file not found: %s', $file_path));
 		}
 
 		self::$moduleName = basename($file_path, '.php');
diff --git a/src/Model/FileTag.php b/src/Model/FileTag.php
index aba819c287..2ad864c9c4 100644
--- a/src/Model/FileTag.php
+++ b/src/Model/FileTag.php
@@ -8,7 +8,6 @@ namespace Friendica\Model;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
-use Friendica\Model\Item;
 
 /**
  * @brief This class handles FileTag related functions
diff --git a/src/Model/Group.php b/src/Model/Group.php
index 1660126e78..606e379f05 100644
--- a/src/Model/Group.php
+++ b/src/Model/Group.php
@@ -10,7 +10,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Util\Security;
 
 /**
  * @brief functions for interacting with the group database table
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 6c071bfc7f..7207958c2f 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -20,15 +20,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
-use Friendica\Model\Event;
-use Friendica\Model\FileTag;
-use Friendica\Model\PermissionSet;
-use Friendica\Model\Term;
-use Friendica\Model\ItemURI;
-use Friendica\Model\Photo;
-use Friendica\Model\Attach;
-use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\DateTimeFormat;
diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index b5841d1785..b9ed609fa1 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -10,7 +10,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Model\Photo;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 
diff --git a/src/Model/Photo.php b/src/Model/Photo.php
index f22e6b86c7..6f2bbd0039 100644
--- a/src/Model/Photo.php
+++ b/src/Model/Photo.php
@@ -220,7 +220,7 @@ class Photo extends BaseObject
 		$fields = self::getFields();
 		$values = array_fill(0, count($fields), "");
 		$photo = array_combine($fields, $values);
-		$photo["backend-class"] = \Friendica\Model\Storage\SystemResource::class;
+		$photo["backend-class"] = Storage\SystemResource::class;
 		$photo["backend-ref"] = $filename;
 		$photo["type"] = $mimetype;
 		$photo["cacheable"] = false;
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 1dedab0ede..27bb12a3c8 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -20,7 +20,6 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 use Friendica\Protocol\Diaspora;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
diff --git a/src/Model/Storage/Database.php b/src/Model/Storage/Database.php
index cfd4803c8f..f9ad7fb7d4 100644
--- a/src/Model/Storage/Database.php
+++ b/src/Model/Storage/Database.php
@@ -8,7 +8,6 @@ namespace Friendica\Model\Storage;
 
 use Friendica\Core\Logger;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
 
 /**
diff --git a/src/Model/User.php b/src/Model/User.php
index 77cdcd6c26..3627333780 100644
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -16,7 +16,6 @@ use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Model\Photo;
 use Friendica\Object\Image;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 04cc923057..3b195cbdb7 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -18,7 +18,6 @@ use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model;
-use Friendica\Module\Login;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Proxy as ProxyUtils;
diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 692e4043ad..25312bdf3a 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -9,7 +9,6 @@ use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Util\HTTPSignature;
-use Friendica\Core\Logger;
 
 /**
  * ActivityPub Inbox
diff --git a/src/Module/Install.php b/src/Module/Install.php
index ab49e426c5..d1a35c1518 100644
--- a/src/Module/Install.php
+++ b/src/Module/Install.php
@@ -4,8 +4,6 @@ namespace Friendica\Module;
 
 use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Database\DBA;
-use Friendica\Database\DBStructure;
 use Friendica\Core;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
diff --git a/src/Module/Photo.php b/src/Module/Photo.php
index ac31835be8..994d0efa61 100644
--- a/src/Module/Photo.php
+++ b/src/Module/Photo.php
@@ -10,10 +10,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Model\Photo as MPhoto;
 use Friendica\Object\Image;
-use Friendica\Util\Security;
-use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Network\HTTPException\BadRequestException;
-use Friendica\Network\HTTPException\InternalServerErrorException;
 
 /**
  * @brief Photo Module
diff --git a/src/Module/Proxy.php b/src/Module/Proxy.php
index 3df90c5356..6ca383f59b 100644
--- a/src/Module/Proxy.php
+++ b/src/Module/Proxy.php
@@ -5,15 +5,11 @@
  */
 namespace Friendica\Module;
 
-use Friendica\App;
 use Friendica\BaseModule;
-use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\System;
-use Friendica\Database\DBA;
 use Friendica\Model\Photo;
 use Friendica\Object\Image;
-use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 
diff --git a/src/Object/Image.php b/src/Object/Image.php
index dfda0634cc..70344dc7c4 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -12,7 +12,6 @@ use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Model\Contact;
 use Friendica\Model\Photo;
 use Friendica\Util\Network;
 use Exception;
diff --git a/src/Object/Post.php b/src/Object/Post.php
index 5e1056aa93..b0307fd964 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -16,7 +16,6 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Conversation;
 use Friendica\Model\Item;
 use Friendica\Model\Term;
 use Friendica\Util\Crypto;
diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index 426e9f802c..c36aa8ea6e 100644
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -7,7 +7,6 @@ namespace Friendica\Object;
 use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Object\Post;
 use Friendica\Util\Security;
 
 /**
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 4c909efbc0..bf8fed94c6 100644
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -4,6 +4,7 @@
  */
 namespace Friendica\Protocol;
 
+use Friendica\Util\JsonLD;
 use Friendica\Util\Network;
 use Friendica\Core\Protocol;
 use Friendica\Model\APContact;
diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 0e00797a46..5c9628d9ce 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -9,7 +9,6 @@ use Friendica\Content\Text\HTML;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Model\Conversation;
 use Friendica\Model\Contact;
 use Friendica\Model\APContact;
 use Friendica\Model\Item;
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index bc127d4086..bfaa1a8955 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -21,7 +21,6 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
 use Friendica\Model\Profile;
-use Friendica\Core\Config;
 use Friendica\Object\Image;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
diff --git a/src/Protocol/Email.php b/src/Protocol/Email.php
index 55bef6d253..dd9230fbd3 100644
--- a/src/Protocol/Email.php
+++ b/src/Protocol/Email.php
@@ -6,7 +6,6 @@ namespace Friendica\Protocol;
 
 use Friendica\Core\Logger;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Protocol;
 use Friendica\Model\Item;
 
 /**
diff --git a/src/Util/HTTPSignature.php b/src/Util/HTTPSignature.php
index bff3287065..a3a73ce136 100644
--- a/src/Util/HTTPSignature.php
+++ b/src/Util/HTTPSignature.php
@@ -5,14 +5,10 @@
  */
 namespace Friendica\Util;
 
-use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Database\DBA;
 use Friendica\Model\User;
 use Friendica\Model\APContact;
-use Friendica\Protocol\ActivityPub;
-use Friendica\Util\DateTimeFormat;
 
 /**
  * @brief Implements HTTP Signatures per draft-cavage-http-signatures-07.
diff --git a/src/Util/LDSignature.php b/src/Util/LDSignature.php
index 5acdfd9013..9762b837f3 100644
--- a/src/Util/LDSignature.php
+++ b/src/Util/LDSignature.php
@@ -3,9 +3,6 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Logger;
-use Friendica\Util\JsonLD;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Protocol\ActivityPub;
 use Friendica\Model\APContact;
 
 /**
diff --git a/src/Util/Proxy.php b/src/Util/Proxy.php
index fc65047b93..9309887409 100644
--- a/src/Util/Proxy.php
+++ b/src/Util/Proxy.php
@@ -2,11 +2,9 @@
 
 namespace Friendica\Util;
 
-use Friendica\BaseModule;
 use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Core\System;
-use Friendica\Util\Strings;
 
 /**
  * @brief Proxy utilities class
diff --git a/src/Util/Security.php b/src/Util/Security.php
index 11059c0bcf..2ad12cebae 100644
--- a/src/Util/Security.php
+++ b/src/Util/Security.php
@@ -9,9 +9,6 @@ use Friendica\BaseObject;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Core\L10n;
-use Friendica\Model\PermissionSet;
-use Friendica\Core\System;
 
 /**
  * Secures that User is allow to do requests
diff --git a/src/Util/Temporal.php b/src/Util/Temporal.php
index b52b939565..0e9baf2498 100644
--- a/src/Util/Temporal.php
+++ b/src/Util/Temporal.php
@@ -8,7 +8,6 @@ namespace Friendica\Util;
 
 use DateTime;
 use DateTimeZone;
-use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
index 798a9b49a1..634a9446eb 100644
--- a/src/Worker/APDelivery.php
+++ b/src/Worker/APDelivery.php
@@ -9,7 +9,6 @@ use Friendica\Core\Logger;
 use Friendica\Core\Worker;
 use Friendica\Model\ItemDeliveryData;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Model\Item;
 use Friendica\Util\HTTPSignature;
 
 class APDelivery extends BaseObject
diff --git a/src/Worker/DBUpdate.php b/src/Worker/DBUpdate.php
index ae25760c87..48c7e7ce6a 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;
 
 class DBUpdate
diff --git a/src/Worker/PubSubPublish.php b/src/Worker/PubSubPublish.php
index 9f5fcdcc5f..e5cbfb785b 100644
--- a/src/Worker/PubSubPublish.php
+++ b/src/Worker/PubSubPublish.php
@@ -5,7 +5,6 @@
 
 namespace Friendica\Worker;
 
-use Friendica\BaseObject;
 use Friendica\Core\Logger;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
diff --git a/src/Worker/SpoolPost.php b/src/Worker/SpoolPost.php
index bb01deace1..e0d6e0c388 100644
--- a/src/Worker/SpoolPost.php
+++ b/src/Worker/SpoolPost.php
@@ -5,7 +5,6 @@
  */
 namespace Friendica\Worker;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Model\Item;