Remove all final references to die! Issue 4524

review? @brson
Issue #4524