death code cleanup