remove all the notification code
merging in removed notifications