Massive XML clean up ;p