diff --git a/src/mca/schizo/prte/schizo_prte.c b/src/mca/schizo/prte/schizo_prte.c
index 1c55b38691..1f6cda75ec 100644
--- a/src/mca/schizo/prte/schizo_prte.c
+++ b/src/mca/schizo/prte/schizo_prte.c
@@ -140,9 +140,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {
     { '\0', "machinefile", 1, PRTE_CMD_LINE_TYPE_STRING,
       "Provide a hostfile",
       PRTE_CMD_LINE_OTYPE_LAUNCH },
-    { '\0', "default-hostfile", 1, PRTE_CMD_LINE_TYPE_STRING,
-      "Provide a default hostfile",
-      PRTE_CMD_LINE_OTYPE_LAUNCH },
     { 'H', "host", 1, PRTE_CMD_LINE_TYPE_STRING,
       "List of hosts to invoke processes on",
       PRTE_CMD_LINE_OTYPE_LAUNCH },
diff --git a/src/tools/prte/prte.c b/src/tools/prte/prte.c
index e6cff25c16..b864f03c10 100644
--- a/src/tools/prte/prte.c
+++ b/src/tools/prte/prte.c
@@ -168,9 +168,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {
     { '\0', "launch-agent", 1, PRTE_CMD_LINE_TYPE_STRING,
       "Name of daemon executable used to start processes on remote nodes (default: prted)",
       PRTE_CMD_LINE_OTYPE_DVM },
-    { '\0', "report-pid", 1, PRTE_CMD_LINE_TYPE_STRING,
-      "Printout pid on stdout [-], stderr [+], or a file [anything else]",
-      PRTE_CMD_LINE_OTYPE_DVM },
     { '\0', "report-uri", 1, PRTE_CMD_LINE_TYPE_STRING,
       "Printout URI on stdout [-], stderr [+], or a file [anything else]",
       PRTE_CMD_LINE_OTYPE_DVM },
@@ -277,10 +274,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {
 
 
     /* Launch options */
-    /* request that argv[0] be indexed */
-    { '\0', "index-argv-by-rank", 0, PRTE_CMD_LINE_TYPE_BOOL,
-      "Uniquely index argv[0] for each process using its rank",
-      PRTE_CMD_LINE_OTYPE_LAUNCH },
     /* Preload the binary on the remote machine */
     { 's', "preload-binary", 0, PRTE_CMD_LINE_TYPE_BOOL,
       "Preload the binary on the remote machine before starting the remote process.",
@@ -312,13 +305,13 @@ static prte_cmd_line_init_t cmd_line_init[] = {
     { '\0', "pset", 1, PRTE_CMD_LINE_TYPE_STRING,
       "User-specified name assigned to the processes in their given application",
       PRTE_CMD_LINE_OTYPE_LAUNCH },
-
+    /* Set default global hostfile */
+    { '\0', "default-hostfile", 1, PRTE_CMD_LINE_TYPE_STRING,
+      "Provide a default hostfile",
+      PRTE_CMD_LINE_OTYPE_LAUNCH },
 
 
     /* Developer options */
-    { '\0', "do-not-resolve", 0, PRTE_CMD_LINE_TYPE_BOOL,
-      "Do not attempt to resolve interfaces - usually used to determine proposed process placement/binding prior to obtaining an allocation",
-      PRTE_CMD_LINE_OTYPE_DEVEL },
     { '\0', "do-not-launch", 0, PRTE_CMD_LINE_TYPE_BOOL,
       "Perform all necessary operations to prepare to launch the application, but do not actually launch it (usually used to test mapping patterns)",
       PRTE_CMD_LINE_OTYPE_DEVEL },
@@ -937,11 +930,6 @@ int main(int argc, char *argv[])
         PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_STDIN_TGT, pval->value.data.string, PMIX_STRING);
     }
 
-    /* if we want the argv's indexed, indicate that */
-    if (prte_cmd_line_is_taken(prte_cmd_line, "index-argv-by-rank")) {
-        PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_INDEX_ARGV, NULL, PMIX_BOOL);
-    }
-
     if (NULL != (pval = prte_cmd_line_get_param(prte_cmd_line, "map-by", 0, 0))) {
         if (donotlaunch && NULL == strcasestr(pval->value.data.string, "donotlaunch")) {
             /* must add directive */
diff --git a/src/tools/prun/prun.c b/src/tools/prun/prun.c
index 1f4f7a7483..3d38b81220 100644
--- a/src/tools/prun/prun.c
+++ b/src/tools/prun/prun.c
@@ -259,10 +259,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {
 
 
     /* Launch options */
-    /* request that argv[0] be indexed */
-    { '\0', "index-argv-by-rank", 0, PRTE_CMD_LINE_TYPE_BOOL,
-      "Uniquely index argv[0] for each process using its rank",
-      PRTE_CMD_LINE_OTYPE_LAUNCH },
     /* Preload the binary on the remote machine */
     { 's', "preload-binary", 0, PRTE_CMD_LINE_TYPE_BOOL,
       "Preload the binary on the remote machine before starting the remote process.",
@@ -298,9 +294,6 @@ static prte_cmd_line_init_t cmd_line_init[] = {
 
 
     /* Developer options */
-    { '\0', "do-not-resolve", 0, PRTE_CMD_LINE_TYPE_BOOL,
-      "Do not attempt to resolve interfaces - usually used to determine proposed process placement/binding prior to obtaining an allocation",
-      PRTE_CMD_LINE_OTYPE_DEVEL },
     { '\0', "do-not-launch", 0, PRTE_CMD_LINE_TYPE_BOOL,
       "Perform all necessary operations to prepare to launch the application, but do not actually launch it (usually used to test mapping patterns)",
       PRTE_CMD_LINE_OTYPE_DEVEL },
@@ -972,11 +965,6 @@ int prun(int argc, char *argv[])
         PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_STDIN_TGT, pval->value.data.string, PMIX_STRING);
     }
 
-    /* if we want the argv's indexed, indicate that */
-    if (prte_cmd_line_is_taken(prte_cmd_line, "index-argv-by-rank")) {
-        PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_INDEX_ARGV, &flag, PMIX_BOOL);
-    }
-
     if (NULL != (pval = prte_cmd_line_get_param(prte_cmd_line, "map-by", 0, 0))) {
         PMIX_INFO_LIST_ADD(ret, jinfo, PMIX_MAPBY, pval->value.data.string, PMIX_STRING);
         if (NULL != strcasestr(pval->value.data.string, "DONOTLAUNCH")) {