diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php
index 9bafb5e175..8a80bd2bea 100644
--- a/src/Protocol/ActivityPub/Processor.php
+++ b/src/Protocol/ActivityPub/Processor.php
@@ -17,10 +17,7 @@ use Friendica\Core\Config;
 use Friendica\Protocol\ActivityPub;
 
 /**
- * ActivityPub Protocol class
- *
- * To-Do:
- * - Store Diaspora signature
+ * ActivityPub Processor Protocol class
  */
 class Processor
 {
diff --git a/src/Protocol/ActivityPub/Transmitter.php b/src/Protocol/ActivityPub/Transmitter.php
index a37d035377..b0e6cd3629 100644
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -39,9 +39,6 @@ require_once 'include/api.php';
  *
  * Complicated object types:
  * - Undo Announce
- *
- * General:
- * - Queueing unsucessful deliveries
  */
 class Transmitter
 {
diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
index 8f986eab11..2e3f16db3e 100644
--- a/src/Worker/RemoveContact.php
+++ b/src/Worker/RemoveContact.php
@@ -7,6 +7,7 @@ namespace Friendica\Worker;
 
 use Friendica\Database\DBA;
 use Friendica\Core\Protocol;
+use Friendica\Model\Item;
 
 require_once 'include/dba.php';
 
@@ -15,12 +16,21 @@ class RemoveContact {
 
 		// Only delete if the contact is to be deleted
 		$condition = ['network' => Protocol::PHANTOM, 'id' => $id];
-		$r = DBA::exists('contact', $condition);
-		if (!DBA::isResult($r)) {
+		$contact = DBA::selectFirst('contact', ['uid'], $condition);
+		if (!DBA::isResult($contact)) {
 			return;
 		}
 
 		// Now we delete the contact and all depending tables
+		$condition = ['uid' => $contact['uid'], 'contact-id' => $id];
+		do {
+			$items = Item::select(['id'], $condition, ['limit' => 100]);
+			while ($item = Item::fetch($items)) {
+				DBA::delete('item', ['id' => $item['id']]);
+			}
+			DBA::close($items);
+		} while (Item::exists($condition));
+
 		DBA::delete('contact', ['id' => $id]);
 	}
 }
diff --git a/src/Worker/RemoveUser.php b/src/Worker/RemoveUser.php
index dfa5ccc097..d8966e5a49 100644
--- a/src/Worker/RemoveUser.php
+++ b/src/Worker/RemoveUser.php
@@ -20,6 +20,13 @@ class RemoveUser {
 		}
 
 		// Now we delete all user items
-		Item::delete(['uid' => $uid], PRIORITY_LOW);
+		$condition = ['uid' => $uid, 'deleted' => false];
+		do {
+			$items = Item::select(['id'], $condition, ['limit' => 100]);
+			while ($item = Item::fetch($items)) {
+				Item::deleteById($item['id'], PRIORITY_LOW);
+			}
+			DBA::close($items);
+		} while (Item::exists($condition));
 	}
 }