Merge "Notification cleanup"