XML Cleanup
XML cleanup