Cleaned up config.xml