Remove busted crash handling