Cleaned up Core Data models.