Cleanup of the XmlConfigBuilder constructor