Refactored destroy() method