Refactoring destroy event