Clean up the config a little