Cleaning up the notification cdoe