Get rid of model_class stuff, probably broken currently