Clean up, change default config