Cleanup matching XML