Clean up and config update