Refactored death code