Cleanup death messages
Clean up of redundant handlers