Removing old notification system