Remove traces of services based xml file parsing