diff --git a/include/Contact.php b/include/Contact.php
index 5d34e45262..60bef93a5a 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -68,7 +68,7 @@ function contact_remove($id) {
 	dba::delete('contact', array('id' => $id));
 
 	// Delete the rest in the background
-	Worker::add(PRIORITY_LOW, 'remove_contact', $id);
+	Worker::add(PRIORITY_LOW, 'RemoveContact', $id);
 }
 
 
diff --git a/include/remove_contact.php b/include/remove_contact.php
deleted file mode 100644
index 9d4b1e4c37..0000000000
--- a/include/remove_contact.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * @file include/remove_contact.php
- * @brief Removes orphaned data from deleted contacts
- */
-
-use Friendica\Core\Config;
-
-function remove_contact_run($argv, $argc) {
-	if ($argc != 2) {
-		return;
-	}
-
-	$id = intval($argv[1]);
-
-	// Only delete if the contact doesn't exist (anymore)
-	$r = dba::exists('contact', array('id' => $id));
-	if ($r) {
-		return;
-	}
-
-	// Now we delete all the depending table entries
-	dba::delete('contact', array('id' => $id));
-}
diff --git a/src/Worker/RemoveContact.php b/src/Worker/RemoveContact.php
new file mode 100644
index 0000000000..2047de5261
--- /dev/null
+++ b/src/Worker/RemoveContact.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * @file src/Worker/RemoveContact.php
+ * @brief Removes orphaned data from deleted contacts
+ */
+namespace Friendica\Worker;
+
+use Friendica\Core\Config;
+
+class RemoveContact {
+	public static function execute($id) {
+
+		// Only delete if the contact doesn't exist (anymore)
+		$r = dba::exists('contact', array('id' => $id));
+		if ($r) {
+			return;
+		}
+
+		// Now we delete all the depending table entries
+		dba::delete('contact', array('id' => $id));
+	}
+}