diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
index 6fe9688..dd2fa89 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Functions.cs
@@ -37,11 +37,6 @@ public partial class MareHub
             _dbContext.Remove(userProfileData);
         }
 
-        while (_dbContext.Files.Any(f => f.Uploader == user))
-        {
-            await Task.Delay(1000).ConfigureAwait(false);
-        }
-
         _dbContext.ClientPairs.RemoveRange(ownPairData);
         await _dbContext.SaveChangesAsync().ConfigureAwait(false);
         var otherPairData = await _dbContext.ClientPairs.Include(u => u.User)
diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
index 25e0606..6b5b005 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.cs
@@ -120,9 +120,6 @@ public partial class MareHub : Hub<IMareHub>, IMareHub
             await RemoveUserFromRedis().ConfigureAwait(false);
 
             await SendOfflineToAllPairedUsers().ConfigureAwait(false);
-
-            _dbContext.RemoveRange(_dbContext.Files.Where(f => !f.Uploaded && f.UploaderUID == UserUID));
-            await _dbContext.SaveChangesAsync().ConfigureAwait(false);
         }
         catch { }
 
diff --git a/MareSynchronosServer/MareSynchronosServer/Program.cs b/MareSynchronosServer/MareSynchronosServer/Program.cs
index 69fe275..8beb97f 100644
--- a/MareSynchronosServer/MareSynchronosServer/Program.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Program.cs
@@ -25,10 +25,8 @@ public class Program
                 context.SaveChanges();
 
                 // clean up residuals
-                var looseFiles = context.Files.Where(f => f.Uploaded == false);
                 var unfinishedRegistrations = context.LodeStoneAuth.Where(c => c.StartedAt != null);
                 context.RemoveRange(unfinishedRegistrations);
-                context.RemoveRange(looseFiles);
                 context.SaveChanges();
 
                 logger.LogInformation(options.ToString());
diff --git a/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs b/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs
index 11b033d..b33c4bd 100644
--- a/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Services/UserCleanupService.cs
@@ -144,9 +144,6 @@ public class UserCleanupService : IHostedService
 
         var auth = dbContext.Auth.Single(a => a.UserUID == user.UID);
 
-        var userFiles = dbContext.Files.Where(f => f.Uploaded && f.Uploader.UID == user.UID).ToList();
-        dbContext.Files.RemoveRange(userFiles);
-
         var ownPairData = dbContext.ClientPairs.Where(u => u.User.UID == user.UID).ToList();
         dbContext.ClientPairs.RemoveRange(ownPairData);
         var otherPairData = dbContext.ClientPairs.Include(u => u.User)
diff --git a/MareSynchronosServer/MareSynchronosShared/Utils/SharedDbFunctions.cs b/MareSynchronosServer/MareSynchronosShared/Utils/SharedDbFunctions.cs
index ac69f42..587ce06 100644
--- a/MareSynchronosServer/MareSynchronosShared/Utils/SharedDbFunctions.cs
+++ b/MareSynchronosServer/MareSynchronosShared/Utils/SharedDbFunctions.cs
@@ -65,9 +65,6 @@ public static class SharedDbFunctions
 
         var auth = dbContext.Auth.Single(a => a.UserUID == user.UID);
 
-        var userFiles = dbContext.Files.Where(f => f.Uploaded && f.Uploader.UID == user.UID).ToList();
-        dbContext.Files.RemoveRange(userFiles);
-
         var ownPairData = dbContext.ClientPairs.Where(u => u.User.UID == user.UID).ToList();
         dbContext.ClientPairs.RemoveRange(ownPairData);
         var otherPairData = dbContext.ClientPairs.Include(u => u.User)
diff --git a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ServerFilesController.cs b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ServerFilesController.cs
index 16d2bbe..0fa1201 100644
--- a/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ServerFilesController.cs
+++ b/MareSynchronosServer/MareSynchronosStaticFilesServer/Controllers/ServerFilesController.cs
@@ -53,38 +53,6 @@ public class ServerFilesController : ControllerBase
     [HttpPost(MareFiles.ServerFiles_DeleteAll)]
     public async Task<IActionResult> FilesDeleteAll()
     {
-        var ownFiles = await _mareDbContext.Files.Where(f => f.Uploaded && f.Uploader.UID == MareUser).ToListAsync().ConfigureAwait(false);
-
-        foreach (var dbFile in ownFiles)
-        {
-            var fi = FilePathUtil.GetFileInfoForHash(_basePath, dbFile.Hash);
-            if (fi != null)
-            {
-                _metricsClient.DecGauge(MetricsAPI.GaugeFilesTotal, fi == null ? 0 : 1);
-                _metricsClient.DecGauge(MetricsAPI.GaugeFilesTotalSize, fi?.Length ?? 0);
-
-                fi?.Delete();
-            }
-        }
-
-        if (!_coldBasePath.IsNullOrEmpty())
-        {
-            foreach (var dbFile in ownFiles)
-            {
-                var fi = FilePathUtil.GetFileInfoForHash(_coldBasePath, dbFile.Hash);
-                if (fi != null)
-                {
-                    _metricsClient.DecGauge(MetricsAPI.GaugeFilesTotalColdStorage, fi == null ? 0 : 1);
-                    _metricsClient.DecGauge(MetricsAPI.GaugeFilesTotalSizeColdStorage, fi?.Length ?? 0);
-
-                    fi?.Delete();
-                }
-            }
-        }
-
-        _mareDbContext.Files.RemoveRange(ownFiles);
-        await _mareDbContext.SaveChangesAsync().ConfigureAwait(false);
-
         return Ok();
     }