clean-up of xml handling