clean up of model