clenup model methods

@staugaard @morten