diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java
index cd126fff..ef2ef72d 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileListManager.java
@@ -22,12 +22,11 @@ import org.qortal.utils.Triple;
 
 import java.util.*;
 
-public class ArbitraryDataFileListManager extends Thread {
+public class ArbitraryDataFileListManager {
 
     private static final Logger LOGGER = LogManager.getLogger(ArbitraryDataFileListManager.class);
 
     private static ArbitraryDataFileListManager instance;
-    private volatile boolean isStopping = false;
 
 
     /**
@@ -67,26 +66,6 @@ public class ArbitraryDataFileListManager extends Thread {
         return instance;
     }
 
-    @Override
-    public void run() {
-        Thread.currentThread().setName("Arbitrary Data File List Manager");
-
-        try {
-            while (!isStopping) {
-                Thread.sleep(2000);
-
-                // TODO
-            }
-        } catch (InterruptedException e) {
-            // Fall-through to exit thread...
-        }
-    }
-
-    public void shutdown() {
-        isStopping = true;
-        this.interrupt();
-    }
-
 
     public void cleanupRequestCache(Long now) {
         if (now == null) {
diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java
index d07ec444..632ed962 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataFileManager.java
@@ -21,12 +21,11 @@ import org.qortal.utils.Triple;
 import java.security.SecureRandom;
 import java.util.*;
 
-public class ArbitraryDataFileManager extends Thread {
+public class ArbitraryDataFileManager {
 
     private static final Logger LOGGER = LogManager.getLogger(ArbitraryDataFileManager.class);
 
     private static ArbitraryDataFileManager instance;
-    private volatile boolean isStopping = false;
 
 
     /**
@@ -51,26 +50,6 @@ public class ArbitraryDataFileManager extends Thread {
         return instance;
     }
 
-    @Override
-    public void run() {
-        Thread.currentThread().setName("Arbitrary Data File List Manager");
-
-        try {
-            while (!isStopping) {
-                Thread.sleep(2000);
-
-                // TODO
-            }
-        } catch (InterruptedException e) {
-            // Fall-through to exit thread...
-        }
-    }
-
-    public void shutdown() {
-        isStopping = true;
-        this.interrupt();
-    }
-
 
     public void cleanupRequestCache(Long now) {
         if (now == null) {
diff --git a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
index 98647eb1..3673e06f 100644
--- a/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
+++ b/src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
@@ -67,9 +67,6 @@ public class ArbitraryDataManager extends Thread {
 	public void run() {
 		Thread.currentThread().setName("Arbitrary Data Manager");
 
-		ArbitraryDataFileListManager.getInstance().start();
-		ArbitraryDataFileManager.getInstance().start();
-
 		try {
 			while (!isStopping) {
 				Thread.sleep(2000);
@@ -116,9 +113,6 @@ public class ArbitraryDataManager extends Thread {
 	public void shutdown() {
 		isStopping = true;
 		this.interrupt();
-
-		ArbitraryDataFileListManager.getInstance().shutdown();
-		ArbitraryDataFileManager.getInstance().shutdown();
 	}
 
 	private void processNames() {