[cleanup] clean data model