[IMP] more clean ups of unused xml data