Xml setup + cleanup