cleaning and fix the namespace in xml issue