Refactor/remove xml util