some cleanup of new notifications code