Config.xml cleanup, helper added