Got rid of the model classes