4 files changed, 2 insertions, 16 deletions
diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index 3c06c26ba0..d755b5393b 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -199,7 +199,6 @@ atom debug_flags
 atom decimals
 atom default
 atom delay_trap
-atom dexit
 atom depth
 atom dgroup_leader
 atom dictionary
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 6e08c72289..e36ea9ba94 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -110,7 +110,6 @@ int erts_dist_buf_busy_limit;
 /* distribution trap functions */
 Export* dmonitor_node_trap = NULL;
 Export* dgroup_leader_trap = NULL;
-Export* dexit_trap = NULL;
 Export* dmonitor_p_trap = NULL;
 
 /* local variables */
@@ -633,7 +632,6 @@ void init_dist(void)
     /* Lookup/Install all references to trap functions */
     dmonitor_node_trap = trap_function(am_dmonitor_node,3);
     dgroup_leader_trap = trap_function(am_dgroup_leader,2);
-    dexit_trap = trap_function(am_dexit, 2);
     dmonitor_p_trap = trap_function(am_dmonitor_p, 2);
     dist_ctrl_put_data_trap = erts_export_put(am_erts_internal,
                                               am_dist_ctrl_put_data,
@@ -3108,9 +3106,6 @@ int distribution_info(fmtfn_t to, void *arg)	/* Called by break handler */
  ** loads functions pointer to trap_functions from module erlang.
  **    erlang:dmonitor_node/3
  **    erlang:dgroup_leader/2
- **    erlang:dexit/2
- **  -- are these needed ?
- **    dexit/1
  ***********************************************************************/
 
 BIF_RETTYPE setnode_2(BIF_ALIST_2)
@@ -3136,8 +3131,7 @@ BIF_RETTYPE setnode_2(BIF_ALIST_2)
     /* Check that all trap functions are defined !! */
     if (dmonitor_node_trap->addressv[0] == NULL ||
 	dgroup_leader_trap->addressv[0] == NULL ||
-	dmonitor_p_trap->addressv[0] == NULL ||
-	dexit_trap->addressv[0] == NULL) {
+	dmonitor_p_trap->addressv[0] == NULL) {
 	goto error;
     }
 
diff --git a/erts/emulator/beam/dist.h b/erts/emulator/beam/dist.h
index 50e72ac42c..339e4839ea 100644
--- a/erts/emulator/beam/dist.h
+++ b/erts/emulator/beam/dist.h
@@ -88,7 +88,6 @@
 /* distribution trap functions */
 extern Export* dmonitor_node_trap;
 extern Export* dgroup_leader_trap;
-extern Export* dexit_trap;
 extern Export* dmonitor_p_trap;
 
 typedef enum {
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 43ac8a6f26..80601ab067 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -32,7 +32,7 @@
 -export([suspend_process/1]).
 -export([min/2, max/2]).
 -export([dgroup_leader/2,
-	 dexit/2, dmonitor_node/3, dmonitor_p/2]).
+	 dmonitor_node/3, dmonitor_p/2]).
 -export([delay_trap/2]).
 -export([set_cookie/2, get_cookie/0]).
 -export([nodes/0]).
@@ -3302,12 +3302,6 @@ dgroup_leader(Leader, Pid) ->
 	false -> true  %% bad arg ?
     end.
 
-dexit(Pid, Reason) -> 
-    case net_kernel:connect(erlang:node(Pid)) of
-	true -> erlang:exit(Pid, Reason);
-	false -> true
-    end.
-
 
 -spec erlang:dmonitor_p('process', pid() | {atom(),atom()}) -> reference().
 dmonitor_p(process, ProcSpec) ->