Removed TODO from XmlParser