general.xml cleanup