Refactoring out unnecessary levels of models