Purged last vestiges of the xml disease