Merge "Update removal logic for notifications"