Simplify the being death code

Still some debugging to do but this is a start.