WIP experiment: late-remove of excess xml