models removing refactoring