Clean up to avoid unnecessary notices and service restarts