clean up data models and collections