Clean up of more some of the data model