small cleanup of notices and alerts