remove XmlWrapper class