config.xml cleanup