diff --git a/app/lib/entity/file/file_cache_manager.dart b/app/lib/entity/file/file_cache_manager.dart
index 853fdeb7..60475043 100644
--- a/app/lib/entity/file/file_cache_manager.dart
+++ b/app/lib/entity/file/file_cache_manager.dart
@@ -110,20 +110,6 @@ class FileSqliteCacheUpdater {
   final DiContainer _c;
 }
 
-class FileSqliteCacheRemover {
-  const FileSqliteCacheRemover(this._c);
-
-  /// Remove a file/dir from cache
-  Future<void> call(Account account, FileDescriptor f) async {
-    await _c.npDb.deleteFile(
-      account: account.toDb(),
-      file: f.toDbKey(),
-    );
-  }
-
-  final DiContainer _c;
-}
-
 class FileSqliteCacheEmptier {
   const FileSqliteCacheEmptier(this._c);
 
diff --git a/app/lib/use_case/album/remove_album.dart b/app/lib/use_case/album/remove_album.dart
index f5773dfb..1fdbd2f6 100644
--- a/app/lib/use_case/album/remove_album.dart
+++ b/app/lib/use_case/album/remove_album.dart
@@ -20,7 +20,6 @@ class RemoveAlbum {
   RemoveAlbum(this._c)
       : assert(require(_c)),
         assert(ListShare.require(_c)),
-        assert(Remove.require(_c)),
         assert(UnshareFileFromAlbum.require(_c));
 
   static bool require(DiContainer c) =>
diff --git a/app/lib/use_case/remove.dart b/app/lib/use_case/remove.dart
index 0b0ab87b..df8cde7d 100644
--- a/app/lib/use_case/remove.dart
+++ b/app/lib/use_case/remove.dart
@@ -24,15 +24,7 @@ part 'remove.g.dart';
 
 @npLog
 class Remove {
-  Remove(this._c)
-      : assert(require(_c)),
-        assert(ListAlbum.require(_c)),
-        assert(ListShare.require(_c)),
-        assert(RemoveFromAlbum.require(_c));
-
-  static bool require(DiContainer c) =>
-      DiContainer.has(c, DiType.fileRepo) &&
-      DiContainer.has(c, DiType.shareRepo);
+  const Remove(this._c);
 
   /// Remove list of [files] and return the removed count
   Future<int> call(
@@ -52,7 +44,7 @@ class Remove {
       final i = pair.item1;
       final f = pair.item2;
       try {
-        await _c.fileRepo.remove(account, f);
+        await _c.fileRepo2.remove(account, f);
         ++count;
         KiwiContainer().resolve<EventBus>().fire(FileRemovedEvent(account, f));
       } catch (e, stackTrace) {