diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
index 88644a0b9e..fb436c3b21 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/notification/DefaultPushRuleService.kt
@@ -58,8 +58,6 @@ internal class DefaultPushRuleService @Inject constructor(private val getPushRul
         var underrideRules: List<PushRule> = emptyList()
 
         monarchy.doWithRealm { realm ->
-            // FIXME PushRulesEntity are not always created here...
-            // FIWME Get the push rules from the sync
             PushRulesEntity.where(realm, scope, RuleSetKey.CONTENT)
                     .findFirst()
                     ?.let { pushRulesEntity ->
diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/SavePushRulesTask.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/SavePushRulesTask.kt
index 948dcf0b01..b658858e47 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/SavePushRulesTask.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/pushers/SavePushRulesTask.kt
@@ -37,8 +37,7 @@ internal class DefaultSavePushRulesTask @Inject constructor(private val monarchy
 
     override suspend fun execute(params: SavePushRulesTask.Params) {
         monarchy.awaitTransaction { realm ->
-            //clear existings?
-            //TODO
+            // clear current push rules
             realm.where(PushRulesEntity::class.java)
                     .findAll()
                     .deleteAllFromRealm()