diff --git a/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt b/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt
index cbfb3e90a54..39c99eec3bb 100644
--- a/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt
+++ b/app/src/main/kotlin/com/wire/android/notification/WireNotificationManager.kt
@@ -354,11 +354,6 @@ class WireNotificationManager @Inject constructor(
                             .also { it.logIfEmptyUserName() }
                             .let { it.handle ?: it.name ?: "" } to calls
                     }
-//                }.map { calls ->
-//                    userSessionScope.users.getSelfUser()
-//                        .also { it?.logIfEmptyUserName() }
-//                        .let { it?.handle ?: it?.name ?: "" } to calls
-//                }
                 }
                 .collect { (userName, calls) ->
                     callNotificationManager.handleIncomingCalls(calls, userId, userName)
@@ -390,23 +385,6 @@ class WireNotificationManager @Inject constructor(
             .distinctUntilChanged()
             .stateIn(scope)
 
-//        val isBlockedByE2EIRequiredState = scope.async {
-//            coreLogic.getSessionScope(userId).observeE2EIRequired()
-//                .map { it is E2EIRequiredResult.NoGracePeriod }
-//                .distinctUntilChanged()
-//                .stateIn(scope)
-//        }
-//
-//        val selfUserNameState = scope.async {
-//            coreLogic.getSessionScope(userId)
-//                .users
-//                .observeSelfUser()
-//                .onEach { it.logIfEmptyUserName() }
-//                .map { it.handle ?: it.name ?: "" }
-//                .distinctUntilChanged()
-//                .stateIn(scope)
-//        }
-
         coreLogic.getSessionScope(userId)
             .messages
             .getNotifications()