Clean up some parts of config