Removed handcrafting of XML (new xml2js features)