config update and cleanup