Xml infrastructure removal