MMLC-13 more clean up for data model