Some cleanup on notifications.