diff --git a/api/src/main/java/me/lucko/luckperms/api/Storage.java b/api/src/main/java/me/lucko/luckperms/api/Storage.java
index 2b8cd6fe2..e582ebd0f 100644
--- a/api/src/main/java/me/lucko/luckperms/api/Storage.java
+++ b/api/src/main/java/me/lucko/luckperms/api/Storage.java
@@ -138,9 +138,13 @@ public interface Storage {
      * Removes users from the main storage who are "default". This is called every time the plugin loads.
      *
      * @return true if the operation completed successfully
+     * @deprecated this method no longer does anything - the cleanup feature was removed. :)
      */
     @Nonnull
-    CompletableFuture<Boolean> cleanupUsers();
+    @Deprecated
+    default CompletableFuture<Boolean> cleanupUsers() {
+        return CompletableFuture.completedFuture(false);
+    }
 
     /**
      * Gets a set all "unique" user UUIDs.
diff --git a/common/src/main/java/me/lucko/luckperms/common/api/delegates/StorageDelegate.java b/common/src/main/java/me/lucko/luckperms/common/api/delegates/StorageDelegate.java
index 165fe29b2..cbbddeeb5 100644
--- a/common/src/main/java/me/lucko/luckperms/common/api/delegates/StorageDelegate.java
+++ b/common/src/main/java/me/lucko/luckperms/common/api/delegates/StorageDelegate.java
@@ -97,11 +97,6 @@ public class StorageDelegate implements Storage {
         return handle.noBuffer().saveUser(UserDelegate.cast(user));
     }
 
-    @Override
-    public CompletableFuture<Boolean> cleanupUsers() {
-        return handle.noBuffer().cleanupUsers();
-    }
-
     @Override
     public CompletableFuture<Set<UUID>> getUniqueUsers() {
         return handle.noBuffer().getUniqueUsers();
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/AbstractStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/AbstractStorage.java
index 59303467f..63f0ac8b9 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/AbstractStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/AbstractStorage.java
@@ -120,11 +120,6 @@ public class AbstractStorage implements Storage {
         return makeFuture(() -> backing.saveUser(user));
     }
 
-    @Override
-    public CompletableFuture<Boolean> cleanupUsers() {
-        return makeFuture(backing::cleanupUsers);
-    }
-
     @Override
     public CompletableFuture<Set<UUID>> getUniqueUsers() {
         return makeFuture(backing::getUniqueUsers);
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/SplitBacking.java b/common/src/main/java/me/lucko/luckperms/common/storage/SplitBacking.java
index c1fce495b..7c1f8d263 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/SplitBacking.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/SplitBacking.java
@@ -115,11 +115,6 @@ public class SplitBacking extends AbstractBacking {
         return backing.get(types.get("user")).saveUser(user);
     }
 
-    @Override
-    public boolean cleanupUsers() {
-        return backing.get(types.get("user")).cleanupUsers();
-    }
-
     @Override
     public Set<UUID> getUniqueUsers() {
         return backing.get(types.get("user")).getUniqueUsers();
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
index f03b0b24f..5048440df 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/Storage.java
@@ -73,8 +73,6 @@ public interface Storage {
 
     CompletableFuture<Boolean> saveUser(User user);
 
-    CompletableFuture<Boolean> cleanupUsers();
-
     CompletableFuture<Set<UUID>> getUniqueUsers();
 
     CompletableFuture<List<HeldPermission<UUID>>> getUsersWithPermission(String permission);
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/AbstractBacking.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/AbstractBacking.java
index 1fd0bc46e..5be4cfbf8 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/AbstractBacking.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/AbstractBacking.java
@@ -76,8 +76,6 @@ public abstract class AbstractBacking {
 
     public abstract boolean saveUser(User user);
 
-    public abstract boolean cleanupUsers();
-
     public abstract Set<UUID> getUniqueUsers();
 
     public abstract List<HeldPermission<UUID>> getUsersWithPermission(String permission);
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/FlatfileBacking.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/FlatfileBacking.java
index 3126fb5a7..2604abb72 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/FlatfileBacking.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/FlatfileBacking.java
@@ -109,9 +109,6 @@ public abstract class FlatfileBacking extends AbstractBacking {
             e.printStackTrace();
         }
 
-        // schedule user cleanup
-        plugin.getScheduler().asyncLater(this::cleanupUsers, 10L);
-
         setAcceptingLogins(true);
     }
 
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/JSONBacking.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/JSONBacking.java
index d31f30512..cbba6335b 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/JSONBacking.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/JSONBacking.java
@@ -232,39 +232,6 @@ public class JSONBacking extends FlatfileBacking {
         }
     }
 
-    @Override
-    public boolean cleanupUsers() {
-        return call("null", () -> {
-            File[] files = usersDir.listFiles((dir, name1) -> name1.endsWith(".json"));
-            if (files == null) return false;
-
-            for (File file : files) {
-                call(file.getName(), () -> {
-                    registerFileAction("users", file);
-
-                    JsonObject object = readObjectFromFile(file);
-
-                    Set<NodeModel> nodes = new HashSet<>();
-                    nodes.addAll(deserializePermissions(object.get("permissions").getAsJsonArray()));
-
-                    boolean shouldDelete = false;
-                    if (nodes.size() == 1) {
-                        for (NodeModel e : nodes) {
-                            // There's only one
-                            shouldDelete = e.getPermission().equalsIgnoreCase("group.default") && e.isValue();
-                        }
-                    }
-
-                    if (shouldDelete) {
-                        file.delete();
-                    }
-                    return true;
-                }, true);
-            }
-            return true;
-        }, false);
-    }
-
     @Override
     public List<HeldPermission<UUID>> getUsersWithPermission(String permission) {
         ImmutableList.Builder<HeldPermission<UUID>> held = ImmutableList.builder();
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/YAMLBacking.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/YAMLBacking.java
index 24ab63c83..7d76d8319 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/YAMLBacking.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/file/YAMLBacking.java
@@ -234,39 +234,6 @@ public class YAMLBacking extends FlatfileBacking {
         }
     }
 
-    @Override
-    public boolean cleanupUsers() {
-        return call("null", () -> {
-            File[] files = usersDir.listFiles((dir, name1) -> name1.endsWith(".yml"));
-            if (files == null) return false;
-
-            for (File file : files) {
-                call(file.getName(), () -> {
-                    registerFileAction("users", file);
-
-                    Map<String, Object> values = readMapFromFile(file);
-
-                    Set<NodeModel> nodes = new HashSet<>();
-                    nodes.addAll(deserializePermissions((List<Object>) values.get("permissions")));
-
-                    boolean shouldDelete = false;
-                    if (nodes.size() == 1) {
-                        for (NodeModel e : nodes) {
-                            // There's only one
-                            shouldDelete = e.getPermission().equalsIgnoreCase("group.default") && e.isValue();
-                        }
-                    }
-
-                    if (shouldDelete) {
-                        file.delete();
-                    }
-                    return true;
-                }, true);
-            }
-            return true;
-        }, false);
-    }
-
     @Override
     public List<HeldPermission<UUID>> getUsersWithPermission(String permission) {
         ImmutableList.Builder<HeldPermission<UUID>> held = ImmutableList.builder();
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/mongodb/MongoDBBacking.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/mongodb/MongoDBBacking.java
index b52209030..bcde15c86 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/mongodb/MongoDBBacking.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/mongodb/MongoDBBacking.java
@@ -364,11 +364,6 @@ public class MongoDBBacking extends AbstractBacking {
         }
     }
 
-    @Override
-    public boolean cleanupUsers() {
-        return true;
-    }
-
     @Override
     public Set<UUID> getUniqueUsers() {
         Set<UUID> uuids = new HashSet<>();
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/backing/sql/SQLBacking.java b/common/src/main/java/me/lucko/luckperms/common/storage/backing/sql/SQLBacking.java
index 1294c8fcd..8816135af 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/backing/sql/SQLBacking.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/backing/sql/SQLBacking.java
@@ -494,11 +494,6 @@ public class SQLBacking extends AbstractBacking {
         }
     }
 
-    @Override
-    public boolean cleanupUsers() {
-        return true;
-    }
-
     @Override
     public Set<UUID> getUniqueUsers() {
         Set<UUID> uuids = new HashSet<>();
diff --git a/common/src/main/java/me/lucko/luckperms/common/storage/wrappings/PhasedStorage.java b/common/src/main/java/me/lucko/luckperms/common/storage/wrappings/PhasedStorage.java
index 13c06fad2..3121aeb33 100644
--- a/common/src/main/java/me/lucko/luckperms/common/storage/wrappings/PhasedStorage.java
+++ b/common/src/main/java/me/lucko/luckperms/common/storage/wrappings/PhasedStorage.java
@@ -131,16 +131,6 @@ public class PhasedStorage implements Storage {
         }
     }
 
-    @Override
-    public CompletableFuture<Boolean> cleanupUsers() {
-        phaser.register();
-        try {
-            return backing.cleanupUsers();
-        } finally {
-            phaser.arriveAndDeregister();
-        }
-    }
-
     @Override
     public CompletableFuture<Set<UUID>> getUniqueUsers() {
         phaser.register();