Clean up of XML framework