Refactoring destroy