diff --git a/src/runtime/ompi_rte_finalize.c b/src/runtime/ompi_rte_finalize.c
index a51545ac23..0de7a88473 100644
--- a/src/runtime/ompi_rte_finalize.c
+++ b/src/runtime/ompi_rte_finalize.c
@@ -30,10 +30,6 @@
  */
 int ompi_rte_finalize(void)
 {
-  ompi_rte_unregister();
-
-  /* cleanup the event processing thread first - before doing any other cleanup */
-  ompi_event_fini();
   mca_pcm_base_close();
   mca_llm_base_close();
   mca_pcmclient_base_close();
diff --git a/src/runtime/ompi_rte_monitor.c b/src/runtime/ompi_rte_monitor.c
index 977b8be0c8..7b65b476a7 100644
--- a/src/runtime/ompi_rte_monitor.c
+++ b/src/runtime/ompi_rte_monitor.c
@@ -36,21 +36,14 @@ int ompi_rte_register(void)
 {
     ompi_buffer_t buffer;
     char segment[32];
-    char *jobid = ompi_name_server.get_jobid_string(ompi_process_info.name);
     char *keys[2];
     void *addr;
     int rc,size;
 
-    /* protect against error */
-    if (NULL == jobid) {
-	return OMPI_ERROR;
-    }
-
     /* setup keys and segment for this job */
-    sprintf(segment, "job-%s", jobid);
-    keys[0] = ompi_name_server.get_proc_name_string(ompi_process_info.name);
+    sprintf(segment, "job-%u", mca_oob_name_self.jobid);
+    keys[0] = ns_base_get_proc_name_string(ompi_process_info.name);
     keys[1] = NULL;
-    free(jobid);
 
     if (ompi_rte_debug_flag) {
         ompi_output(0, "rte_register: entered for proc %s", keys[0]);
@@ -82,20 +75,12 @@ int ompi_rte_register(void)
 int ompi_rte_unregister(void)
 {
     char segment[32];
-    char *jobid = ompi_name_server.get_jobid_string(ompi_process_info.name);
     char *keys[2];
     int rc;
 
-    /* protect against error */
-    if (NULL == jobid) {
-	return OMPI_ERROR;
-    }
-
     /* setup keys and segment for this job */
-    sprintf(segment, "job-%s", jobid);
-    free(jobid);
-
-    keys[0] = ompi_name_server.get_proc_name_string(ompi_process_info.name);
+    sprintf(segment, "job-%u", mca_oob_name_self.jobid);
+    keys[0] = ns_base_get_proc_name_string(ompi_process_info.name);
     keys[1] = NULL;
         
     rc = ompi_registry.delete_object(OMPI_REGISTRY_XAND, segment, keys);