[IMP] more clean ups of unused xml data, moving date to different xml files.