PR for getting rid of PyXML dep and cleaning XML-related API