Removed death code

This code was commented out so we can remove it.

By the way: do you have any code standard?