diff --git a/src/Content/Text/HTML.php b/src/Content/Text/HTML.php
index 7976b02e6..47463bdd0 100644
--- a/src/Content/Text/HTML.php
+++ b/src/Content/Text/HTML.php
@@ -11,10 +11,7 @@ use Friendica\Content\Widget\ContactBlock;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
diff --git a/src/Module/Contact.php b/src/Module/Contact.php
index 59f2627e3..230ad4b57 100644
--- a/src/Module/Contact.php
+++ b/src/Module/Contact.php
@@ -8,7 +8,6 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
 use Friendica\Content\Widget;
 use Friendica\Core\ACL;
 use Friendica\Core\Hook;
diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
index 25312bdf3..e955f11a3 100644
--- a/src/Module/Inbox.php
+++ b/src/Module/Inbox.php
@@ -8,7 +8,6 @@ use Friendica\BaseModule;
 use Friendica\Protocol\ActivityPub;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Util\HTTPSignature;
 
 /**
  * ActivityPub Inbox
@@ -25,19 +24,6 @@ class Inbox extends BaseModule
 			System::httpExit(400);
 		}
 
-// Enable for test purposes
-/*
-		if (HTTPSignature::getSigner($postdata, $_SERVER)) {
-			$filename = 'signed-activitypub';
-		} else {
-			$filename = 'failed-activitypub';
-		}
-
-		$tempfile = tempnam(get_temppath(), $filename);
-		file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
-
-		Logger::log('Incoming message stored under ' . $tempfile);
-*/
 		if (!empty($a->argv[1])) {
 			$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
 			if (!DBA::isResult($user)) {
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index a44f5c8b5..05ce13879 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -23,7 +23,6 @@ use Friendica\Util\LDSignature;
 use Friendica\Model\Profile;
 use Friendica\Object\Image;
 use Friendica\Protocol\ActivityPub;
-use Friendica\Protocol\Diaspora;
 use Friendica\Core\Cache;
 use Friendica\Util\Map;
 use Friendica\Util\Network;