Remove some old exit_trap legacy code