Revert "Improve Clean Dead"

This reverts commit c6b97d21c53b7293aa1ffed263b70e94adc208aa.