chore(xml): code cleanup

related to CAM-3176