diff --git a/openmpi/PLIST b/openmpi/PLIST
index f20904d4eb..5f30e06164 100644
--- a/openmpi/PLIST
+++ b/openmpi/PLIST
@@ -44,28 +44,22 @@ openmpi4/include/openmpi/ompi/mpiext/pcollreq/mpif-h/mpiext_pcollreq_mpifh.h
 openmpi4/lib/libmca_common_monitoring.la
 openmpi4/lib/libmca_common_ompio.la
 openmpi4/lib/libmca_common_sm.la
-openmpi4/lib/libmca_common_verbs.la
 openmpi4/lib/libmpi.la
 openmpi4/lib/libmpi_mpifh.la
-openmpi4/lib/libmpi_usempi_ignore_tkr.la
-openmpi4/lib/libmpi_usempif08.la
+openmpi4/lib/libmpi_usempi.a
+openmpi4/lib/libmpi_usempi.la
+openmpi4/lib/libmpi_usempi.so
+openmpi4/lib/libmpi_usempi.so.40
+openmpi4/lib/libmpi_usempi.so.40.20.0
 openmpi4/lib/libompitrace.la
 openmpi4/lib/libopen-pal.la
 openmpi4/lib/libopen-rte.la
 openmpi4/lib/mpi.mod
-openmpi4/lib/mpi_ext.mod
-openmpi4/lib/mpi_f08.mod
-openmpi4/lib/mpi_f08_callbacks.mod
-openmpi4/lib/mpi_f08_ext.mod
-openmpi4/lib/mpi_f08_interfaces.mod
-openmpi4/lib/mpi_f08_interfaces_callbacks.mod
-openmpi4/lib/mpi_f08_types.mod
 openmpi4/lib/ompi_monitoring_prof.la
 openmpi4/lib/openmpi/libompi_dbg_msgq.la
 openmpi4/lib/openmpi/mca_allocator_basic.la
 openmpi4/lib/openmpi/mca_allocator_bucket.la
 openmpi4/lib/openmpi/mca_bml_r2.la
-openmpi4/lib/openmpi/mca_btl_openib.la
 openmpi4/lib/openmpi/mca_btl_self.la
 openmpi4/lib/openmpi/mca_btl_sm.la
 openmpi4/lib/openmpi/mca_btl_tcp.la
@@ -125,7 +119,9 @@ openmpi4/lib/openmpi/mca_pmix_pmix3x.la
 openmpi4/lib/openmpi/mca_pml_cm.la
 openmpi4/lib/openmpi/mca_pml_monitoring.la
 openmpi4/lib/openmpi/mca_pml_ob1.la
-openmpi4/lib/openmpi/mca_pstat_linux.la
+openmpi4/lib/openmpi/mca_pstat_test.a
+openmpi4/lib/openmpi/mca_pstat_test.la
+openmpi4/lib/openmpi/mca_pstat_test.so
 openmpi4/lib/openmpi/mca_ras_simulator.la
 openmpi4/lib/openmpi/mca_rcache_grdma.la
 openmpi4/lib/openmpi/mca_reachable_weighted.la
@@ -186,7 +182,6 @@ openmpi4/lib/pmix/mca_psensor_heartbeat.la
 openmpi4/lib/pmix/mca_pshmem_mmap.la
 openmpi4/lib/pmix/mca_ptl_tcp.la
 openmpi4/lib/pmix/mca_ptl_usock.la
-openmpi4/lib/pmpi_f08_interfaces.mod
 openmpi4/man/man1/mpiCC.1
 openmpi4/man/man1/mpic++.1
 openmpi4/man/man1/mpicc.1
@@ -651,7 +646,6 @@ openmpi4/man/man7/orte_filem.7
 openmpi4/man/man7/orte_hosts.7
 openmpi4/man/man7/orte_snapc.7
 openmpi4/man/man7/orte_sstore.7
-openmpi4/share/openmpi/amca-param-sets/btl-openib-benchmark
 openmpi4/share/openmpi/amca-param-sets/example.conf
 openmpi4/share/openmpi/examples/openmpi-mca-params.conf
 openmpi4/share/openmpi/examples/openmpi-totalview.tcl
@@ -668,9 +662,6 @@ openmpi4/share/openmpi/help-mca-hook-base.txt
 openmpi4/share/openmpi/help-mca-var.txt
 openmpi4/share/openmpi/help-mpi-api.txt
 openmpi4/share/openmpi/help-mpi-btl-base.txt
-openmpi4/share/openmpi/help-mpi-btl-openib-cpc-base.txt
-openmpi4/share/openmpi/help-mpi-btl-openib-cpc-rdmacm.txt
-openmpi4/share/openmpi/help-mpi-btl-openib.txt
 openmpi4/share/openmpi/help-mpi-btl-sm.txt
 openmpi4/share/openmpi/help-mpi-btl-tcp.txt
 openmpi4/share/openmpi/help-mpi-coll-sm.txt
@@ -681,14 +672,12 @@ openmpi4/share/openmpi/help-mpi-runtime.txt
 openmpi4/share/openmpi/help-mpool-base.txt
 openmpi4/share/openmpi/help-oob-base.txt
 openmpi4/share/openmpi/help-oob-tcp.txt
-openmpi4/share/openmpi/help-opal-common-verbs.txt
 openmpi4/share/openmpi/help-opal-crs-none.txt
 openmpi4/share/openmpi/help-opal-hwloc-base.txt
 openmpi4/share/openmpi/help-opal-runtime.txt
 openmpi4/share/openmpi/help-opal-shmem-mmap.txt
 openmpi4/share/openmpi/help-opal-shmem-posix.txt
 openmpi4/share/openmpi/help-opal-shmem-sysv.txt
-openmpi4/share/openmpi/help-opal-timer-linux.txt
 openmpi4/share/openmpi/help-opal-util.txt
 openmpi4/share/openmpi/help-opal-wrapper.txt
 openmpi4/share/openmpi/help-opal_info.txt
@@ -722,7 +711,6 @@ openmpi4/share/openmpi/help-rcache-base.txt
 openmpi4/share/openmpi/help-regex.txt
 openmpi4/share/openmpi/help-rmaps_rank_file.txt
 openmpi4/share/openmpi/help-state-base.txt
-openmpi4/share/openmpi/mca-btl-openib-device-params.ini
 openmpi4/share/openmpi/mpiCC-wrapper-data.txt
 openmpi4/share/openmpi/mpic++-wrapper-data.txt
 openmpi4/share/openmpi/mpicc-wrapper-data.txt