Cleanup in XML