NotificationSettings: Cleanup