Yep, more config.xml cleanup