Merge "remove xml_utils and all things that depend on it"