[cleanup] data model