More view->model cleanup