cleaning data models again