diff --git a/orte/mca/filem/rsh/filem_rsh_module.c b/orte/mca/filem/rsh/filem_rsh_module.c
index 6684b29c6c..4134dde538 100644
--- a/orte/mca/filem/rsh/filem_rsh_module.c
+++ b/orte/mca/filem/rsh/filem_rsh_module.c
@@ -844,9 +844,6 @@ static int  orte_filem_rsh_start_command(orte_filem_base_process_set_t *proc_set
     orte_filem_rsh_work_pool_item_t *wp_item = NULL;
     int ret;
 
-    proc_set->source.vpid  = 1;
-    proc_set->source.jobid = 0;
-
     /* Construct a work pool item */
     wp_item = OBJ_NEW(orte_filem_rsh_work_pool_item_t);
     /* Copy the Process Set */
diff --git a/orte/mca/snapc/full/snapc_full_global.c b/orte/mca/snapc/full/snapc_full_global.c
index c7daa52101..79883d8af2 100644
--- a/orte/mca/snapc/full/snapc_full_global.c
+++ b/orte/mca/snapc/full/snapc_full_global.c
@@ -1049,6 +1049,20 @@ static int snapc_full_global_gather_all_files(void) {
             goto cleanup;
         }
 
+        /*
+         * Now that the files have been brought local, remove the remote copy
+         */
+        for(item  = opal_list_get_first( &all_filem_requests);
+            item != opal_list_get_end(   &all_filem_requests);
+            item  = opal_list_get_next(   item) ) {
+            filem_request = (orte_filem_base_request_t *) item;
+            if(ORTE_SUCCESS != (ret = orte_filem.rm_nb(filem_request)) ) {
+                exit_status = ret;
+                /* Keep removing, eventually return an error */
+                continue;
+            }
+        }
+
         /*
          * Update all of the metadata
          */
@@ -1069,20 +1083,6 @@ static int snapc_full_global_gather_all_files(void) {
             }
         }
 
-        /*
-         * Now that the files have been brought local, remove the remote copy
-         */
-        for(item  = opal_list_get_first( &all_filem_requests);
-            item != opal_list_get_end(   &all_filem_requests);
-            item  = opal_list_get_next(   item) ) {
-            filem_request = (orte_filem_base_request_t *) item;
-            if(ORTE_SUCCESS != (ret = orte_filem.rm_nb(filem_request)) ) {
-                exit_status = ret;
-                /* Keep removing, eventually return an error */
-                continue;
-            }
-        }
-
         /*
          * Wait for all the removes to complete
          */