diff --git a/src/mca/plm/donau/plm_donau_module.c b/src/mca/plm/donau/plm_donau_module.c
index b49857c307c386811951715441f8f3f51367e4a7..8d846373eb2df8d177c2579cfc15f2381ded2604 100644
--- a/src/mca/plm/donau/plm_donau_module.c
+++ b/src/mca/plm/donau/plm_donau_module.c
@@ -203,10 +203,6 @@ static void launch_daemons(int fd, short args, void *cbdata)
         return;
     }
 
-    // OPAL_OUTPUT_VERBOSE((1, orte_plm_base_framework.framework_output,
-    //                      "%s plm:donau: launching vm",
-    //                      ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
-
     /* get the map for the job */
     if (NULL == (map = daemons->map)) {
         PRTE_ERROR_LOG(PRTE_ERR_NOT_FOUND);
diff --git a/src/tools/prted/prted.c b/src/tools/prted/prted.c
index 0e78ec7da4767f94bfe30c8c52c4774b46558b97..cdfff4576a1d6d42260c559b3e83732669465179 100644
--- a/src/tools/prted/prted.c
+++ b/src/tools/prted/prted.c
@@ -504,7 +504,19 @@ int main(int argc, char *argv[])
     PRTE_RML_RECV(PRTE_NAME_WILDCARD, PRTE_RML_TAG_PRTED_CALLBACK,
                   PRTE_RML_PERSISTENT, rollup, NULL);
 
-    if (prte_static_ports || NULL != prte_parent_uri) {
+    char *donau_job_id = getenv("CCS_JOB_ID");
+    donau_launch_exec = getenv("OMPI_MCA_plm_rsh_agent");
+    if (NULL != donau_launch_exec && (NULL != strstr(donau_launch_exec, "ssh") || 
+        strstr(donau_launch_exec, "dstart"))) {
+        prte_donau_launch_type = DONAU_SSH;
+    }
+
+    int is_simp = (NULL != donau_job_id &&
+        0 != strlen(donau_job_id) &&
+        DONAU_DRUN == prte_donau_launch_type);
+
+    if(!is_simp &&
+        (prte_static_ports || NULL != prte_parent_uri)) {
         /* since we will be waiting for any children to send us
          * their rollup info before sending to our parent, save
          * a little time in the launch phase by "warming up" the