Started cleanup

Started cleanup of the creation of notifications.