More refactoring after model deletions