Move model methods to model object

And remove from env wrapper class