chore(xml): cleanup mapper

related to #CAM-3176