More xml removals.