diff --git a/ompi/tools/ompi_info/components.c b/ompi/tools/ompi_info/components.c
index 98876c71a8..ae4ab71dae 100644
--- a/ompi/tools/ompi_info/components.c
+++ b/ompi/tools/ompi_info/components.c
@@ -33,34 +33,6 @@
 #include "orte/runtime/orte_info_support.h"
 #endif
 
-#include "ompi/mca/allocator/base/base.h"
-#include "ompi/mca/coll/base/base.h"
-#include "ompi/mca/io/io.h"
-#include "ompi/mca/io/base/base.h"
-#include "ompi/mca/mpool/base/base.h"
-#include "ompi/mca/pml/pml.h"
-#include "ompi/mca/pml/base/base.h"
-#include "ompi/mca/bml/base/base.h"
-#include "ompi/mca/rcache/rcache.h"
-#include "ompi/mca/rcache/base/base.h"
-#include "ompi/mca/btl/base/base.h"
-#include "ompi/mca/mtl/mtl.h"
-#include "ompi/mca/mtl/base/base.h"
-#include "ompi/mca/topo/base/base.h"
-#include "ompi/mca/osc/osc.h"
-#include "ompi/mca/osc/base/base.h"
-#include "ompi/mca/op/base/base.h"
-#include "ompi/mca/vprotocol/base/base.h"
-#include "ompi/mca/fbtl/fbtl.h"
-#include "ompi/mca/fbtl/base/base.h"
-#include "ompi/mca/fs/fs.h"
-#include "ompi/mca/fs/base/base.h"
-#include "ompi/mca/fcoll/fcoll.h"
-#include "ompi/mca/fcoll/base/base.h"
-#include "ompi/mca/sharedfp/sharedfp.h"
-#include "ompi/mca/sharedfp/base/base.h"
-#include "ompi/runtime/params.h"
-
 #if OPAL_ENABLE_FT_CR == 1
 #include "ompi/mca/crcp/crcp.h"
 #include "ompi/mca/crcp/base/base.h"
diff --git a/ompi/tools/ompi_info/ompi_info.c b/ompi/tools/ompi_info/ompi_info.c
index d1a3f31ca6..d40f3b1dc4 100644
--- a/ompi/tools/ompi_info/ompi_info.c
+++ b/ompi/tools/ompi_info/ompi_info.c
@@ -72,7 +72,6 @@ int main(int argc, char *argv[])
     bool want_all = false;
     char **app_env = NULL, **global_env = NULL;
     int i;
-    char *str;
     opal_cmd_line_t *ompi_info_cmd_line;
     opal_pointer_array_t mca_types;
     opal_pointer_array_t component_map;
@@ -130,27 +129,6 @@ int main(int argc, char *argv[])
     /* init the component map */
     OBJ_CONSTRUCT(&component_map, opal_pointer_array_t);
     opal_pointer_array_init(&component_map, 256, INT_MAX, 128);
-    
-    /* Register OPAL's params */
-    if (OPAL_SUCCESS != (ret = opal_info_register_framework_params(&component_map))) {
-        if (OPAL_ERR_BAD_PARAM == ret) {
-            /* output where the error occurred */
-            opal_info_err_params(&component_map);
-        }
-        exit(1);
-    }
-
-#if OMPI_RTE_ORTE
-    /* Register ORTE's params */
-    if (OMPI_SUCCESS != (ret = orte_info_register_framework_params(&component_map))) {
-        if (OPAL_ERR_BAD_PARAM == ret) {
-            /* output what we got */
-            opal_info_do_params(true, opal_cmd_line_is_taken(ompi_info_cmd_line, "internal"),
-                                &mca_types, NULL);
-        }
-        exit(1);
-    }
-#endif
 
     /* Register OMPI's params */
     if (OMPI_SUCCESS != (ret = ompi_info_register_framework_params(&component_map))) {
diff --git a/opal/runtime/opal_info_support.c b/opal/runtime/opal_info_support.c
index 2b4854a778..b21fa3cd32 100644
--- a/opal/runtime/opal_info_support.c
+++ b/opal/runtime/opal_info_support.c
@@ -772,7 +772,7 @@ void opal_info_show_component_version(opal_pointer_array_t *mca_types,
             return;
         }
     } else {
-        want_all_components = true;
+        want_all_types = true;
     }
     
     /* Now that we have a valid type, find the right components */