v2.8 beta1
XML cleanup