refactoring and kill models