Removed some unused code
Merge pull request #681 from mpscholten/removed-death-code

Removed some unused code