XML cleanup, spring cleaning complete