diff --git a/orte/mca/iof/svc/iof_svc_component.c b/orte/mca/iof/svc/iof_svc_component.c
index 185b375009..21e9f0f4aa 100644
--- a/orte/mca/iof/svc/iof_svc_component.c
+++ b/orte/mca/iof/svc/iof_svc_component.c
@@ -74,18 +74,6 @@ orte_iof_svc_component_t mca_iof_svc_component = {
     }
 };
 
-#if 0
-static char* orte_iof_svc_param_register_string(
-    const char* param_name,
-    const char* default_value)
-{
-    char *param_value;
-    int id = mca_base_param_register_string("iof","svc",param_name,NULL,default_value);
-    mca_base_param_lookup_string(id, &param_value);
-    return param_value;
-}
-#endif
-
 static  int orte_iof_svc_param_register_int(
     const char* param_name,
     int default_value)
@@ -147,6 +135,7 @@ static orte_iof_base_module_t*
 orte_iof_svc_init(int* priority, bool *allow_multi_user_threads, bool *have_hidden_threads)
 {
     int rc;
+
     if (false == orte_process_info.seed) {
         return NULL;
     }
@@ -186,6 +175,7 @@ orte_iof_svc_init(int* priority, bool *allow_multi_user_threads, bool *have_hidd
 int
 orte_iof_svc_finalize(void)
 {
+    orte_rml.recv_cancel(ORTE_NAME_WILDCARD, ORTE_RML_TAG_IOF_SVC );
     orte_rml.del_exception_handler(orte_iof_svc_exception_handler);
 
     return ORTE_SUCCESS;