system.xml cleanup