Remove unneeded data models