diff --git a/ompi/mca/btl/self/btl_self.h b/ompi/mca/btl/self/btl_self.h
index 020df1e649..f02fd8e54a 100644
--- a/ompi/mca/btl/self/btl_self.h
+++ b/ompi/mca/btl/self/btl_self.h
@@ -117,30 +117,7 @@ int mca_btl_self_add_procs(
     struct ompi_bitmap_t* reachability
 );
 
-                                                                                                               
-/**
- * PML->BTL notification of change in the process list.
- * PML->BTL Notification that a receive fragment has been matched.
- * Called for message that is send from process with the virtual
- * address of the shared memory segment being the same as that of
- * the receiver.
- * 
- * @param btl (IN)
- * @param proc (IN)  
- * @param peer (OUT)
- * @return     OMPI_SUCCESS or error status on failure.
- * 
- */
 
-int mca_btl_self_add_procs_same_base_addr(
-    struct mca_btl_base_module_t* btl,
-    size_t nprocs,
-    struct ompi_proc_t **procs,
-    struct mca_btl_base_endpoint_t** peers,
-    ompi_bitmap_t* reachability
-);
-
-                                                                                                               
 /**
  * PML->BTL notification of change in the process list.
  *
diff --git a/ompi/mca/btl/sm/btl_sm.h b/ompi/mca/btl/sm/btl_sm.h
index 113ace7af5..4c21b47f45 100644
--- a/ompi/mca/btl/sm/btl_sm.h
+++ b/ompi/mca/btl/sm/btl_sm.h
@@ -224,29 +224,6 @@ extern int mca_btl_sm_add_procs(
 );
 
 
-/**
- * PML->BTL notification of change in the process list.
- * PML->BTL Notification that a receive fragment has been matched.
- * Called for message that is send from process with the virtual
- * address of the shared memory segment being the same as that of
- * the receiver.
- * 
- * @param btl (IN)
- * @param proc (IN)  
- * @param peer (OUT)
- * @return     OMPI_SUCCESS or error status on failure.
- * 
- */
-
-extern int mca_btl_sm_add_procs_same_base_addr(
-    struct mca_btl_base_module_t* btl,
-    size_t nprocs,
-    struct ompi_proc_t **procs,
-    struct mca_btl_base_endpoint_t** peers,
-    ompi_bitmap_t* reachability
-);
-
-                                                                                                               
 /**
  * PML->BTL notification of change in the process list.
  *
diff --git a/ompi/mca/btl/sm/btl_sm_component.c b/ompi/mca/btl/sm/btl_sm_component.c
index ad9f48ddfb..3f8a3d3d5c 100644
--- a/ompi/mca/btl/sm/btl_sm_component.c
+++ b/ompi/mca/btl/sm/btl_sm_component.c
@@ -286,14 +286,6 @@ mca_btl_base_module_t** mca_btl_sm_component_init(
     mca_btl_sm.super.btl_max_send_size=mca_btl_sm_component.max_frag_size;
     mca_btl_sm.super.btl_min_rdma_size=mca_btl_sm_component.max_frag_size;
     mca_btl_sm.super.btl_max_rdma_size=mca_btl_sm_component.max_frag_size;
-    /* The order in which the SM modules are initialized is important as only
-     * the first one (the one using the mca_btl_sm_add_procs_same_base_addr)
-     * will setup all the memory for the internal structures (sm_proc_connect).
-     * Therefore, the order in which the two SM module will be after the
-     * selection is important. We have to make sure they get sorted in the
-     * correct order. The simplest way is to force the exclusivity of the
-     * second module to something lower than the exclusivity of the first one.
-     */
     mca_btl_sm.super.btl_exclusivity = mca_btl_sm_component.sm_exclusivity;
     mca_btl_sm.super.btl_latency     = mca_btl_sm_component.sm_latency; /* lowest latency */
     mca_btl_sm.super.btl_bandwidth   = 900; /* not really used now since exclusivity is set to the highest value */