more xml cleanup