Cleaned up the XML configuration files