xml: clean up