Destroy refactored