Removing unused datamodels