Fix Remove Notification Logics