diff --git a/app/lib/event/event.dart b/app/lib/event/event.dart
index c91d0d20..bbcd6f93 100644
--- a/app/lib/event/event.dart
+++ b/app/lib/event/event.dart
@@ -4,7 +4,6 @@ import 'package:event_bus/event_bus.dart';
 import 'package:kiwi/kiwi.dart';
 import 'package:logging/logging.dart';
 import 'package:nc_photos/account.dart';
-import 'package:nc_photos/entity/album.dart';
 import 'package:nc_photos/entity/file.dart';
 import 'package:nc_photos/entity/file_descriptor.dart';
 import 'package:nc_photos/entity/local_file.dart';
@@ -46,20 +45,6 @@ class AccountPrefUpdatedEvent {
   final dynamic value;
 }
 
-class AlbumCreatedEvent {
-  AlbumCreatedEvent(this.account, this.album);
-
-  final Account account;
-  final Album album;
-}
-
-class AlbumUpdatedEvent {
-  AlbumUpdatedEvent(this.account, this.album);
-
-  final Account account;
-  final Album album;
-}
-
 class FilePropertyUpdatedEvent {
   FilePropertyUpdatedEvent(this.account, this.file, this.properties);
 
@@ -97,13 +82,6 @@ class FileMovedEvent {
   final String destination;
 }
 
-class ShareCreatedEvent {
-  const ShareCreatedEvent(this.account, this.share);
-
-  final Account account;
-  final Share share;
-}
-
 class ShareRemovedEvent {
   const ShareRemovedEvent(this.account, this.share);
 
diff --git a/app/lib/use_case/album/create_album.dart b/app/lib/use_case/album/create_album.dart
index 853bb874..bc731b90 100644
--- a/app/lib/use_case/album/create_album.dart
+++ b/app/lib/use_case/album/create_album.dart
@@ -1,19 +1,11 @@
-import 'package:event_bus/event_bus.dart';
-import 'package:kiwi/kiwi.dart';
 import 'package:nc_photos/account.dart';
 import 'package:nc_photos/entity/album.dart';
-import 'package:nc_photos/event/event.dart';
 
 class CreateAlbum {
-  CreateAlbum(this.albumRepo);
+  const CreateAlbum(this.albumRepo);
 
-  Future<Album> call(Account account, Album album) async {
-    final newAlbum = await albumRepo.create(account, album);
-    KiwiContainer()
-        .resolve<EventBus>()
-        .fire(AlbumCreatedEvent(account, newAlbum));
-    return newAlbum;
-  }
+  Future<Album> call(Account account, Album album) async =>
+      albumRepo.create(account, album);
 
   final AlbumRepo albumRepo;
 }
diff --git a/app/lib/use_case/create_share.dart b/app/lib/use_case/create_share.dart
index 0d99815f..996a1e77 100644
--- a/app/lib/use_case/create_share.dart
+++ b/app/lib/use_case/create_share.dart
@@ -1,18 +1,12 @@
-import 'package:event_bus/event_bus.dart';
-import 'package:kiwi/kiwi.dart';
 import 'package:nc_photos/account.dart';
 import 'package:nc_photos/entity/file.dart';
 import 'package:nc_photos/entity/share.dart';
-import 'package:nc_photos/event/event.dart';
 
 class CreateUserShare {
   const CreateUserShare(this.shareRepo);
 
-  Future<Share> call(Account account, File file, String shareWith) async {
-    final share = await shareRepo.create(account, file, shareWith);
-    KiwiContainer().resolve<EventBus>().fire(ShareCreatedEvent(account, share));
-    return share;
-  }
+  Future<Share> call(Account account, File file, String shareWith) =>
+      shareRepo.create(account, file, shareWith);
 
   final ShareRepo shareRepo;
 }
@@ -24,11 +18,8 @@ class CreateLinkShare {
     Account account,
     File file, {
     String? password,
-  }) async {
-    final share = await shareRepo.createLink(account, file, password: password);
-    KiwiContainer().resolve<EventBus>().fire(ShareCreatedEvent(account, share));
-    return share;
-  }
+  }) =>
+      shareRepo.createLink(account, file, password: password);
 
   final ShareRepo shareRepo;
 }
diff --git a/app/lib/use_case/update_album.dart b/app/lib/use_case/update_album.dart
index 3ebe202b..5cf0f065 100644
--- a/app/lib/use_case/update_album.dart
+++ b/app/lib/use_case/update_album.dart
@@ -1,10 +1,7 @@
-import 'package:event_bus/event_bus.dart';
-import 'package:kiwi/kiwi.dart';
 import 'package:nc_photos/account.dart';
 import 'package:nc_photos/entity/album.dart';
 import 'package:nc_photos/entity/album/item.dart';
 import 'package:nc_photos/entity/album/provider.dart';
-import 'package:nc_photos/event/event.dart';
 import 'package:nc_photos/exception.dart';
 
 class UpdateAlbum {
@@ -29,7 +26,6 @@ class UpdateAlbum {
     } else {
       await albumRepo.update(account, album);
     }
-    KiwiContainer().resolve<EventBus>().fire(AlbumUpdatedEvent(account, album));
   }
 
   List<AlbumItem> _minimizeItems(List<AlbumItem> items) {