diff --git a/contrib/platform/cisco/linux b/contrib/platform/cisco/linux
deleted file mode 100644
index 08e931e7a2..0000000000
--- a/contrib/platform/cisco/linux
+++ /dev/null
@@ -1,31 +0,0 @@
-enable_multicast=no
-enable_sensors=yes
-enable_heartbeat=no
-enable_opal_multi_threads=no
-enable_ft_thread=no
-enable_mem_debug=no
-enable_mem_profile=no
-enable_debug_symbols=yes
-enable_binaries=yes
-enable_heterogeneous=no
-enable_picky=yes
-enable_debug=yes
-enable_shared=yes
-enable_static=no
-enable_memchecker=no
-enable_ipv6=yes
-enable_mpi_fortran=no
-enable_mpi_cxx=no
-enable_mpi_cxx_seek=no
-enable_cxx_exceptions=no
-enable_per_user_config_files=no
-enable_script_wrapper_compilers=no
-enable_orterun_prefix_by_default=yes
-enable_io_romio=no
-enable_vt=no
-enable_mca_no_build=crs,memchecker,snapc,crcp,sstore,compress,rml-ftrm
-with_memory_manager=no
-with_tm=no
-with_devel_headers=yes
-with_portals=no
-with_valgrind=no
diff --git a/contrib/platform/cisco/linux-static b/contrib/platform/cisco/linux-static
deleted file mode 100644
index f39cc3e232..0000000000
--- a/contrib/platform/cisco/linux-static
+++ /dev/null
@@ -1,32 +0,0 @@
-enable_dlopen=yes
-enable_multicast=yes
-enable_sensors=yes
-enable_heartbeat=yes
-enable_opal_multi_threads=yes
-enable_ft_thread=no
-enable_mem_debug=no
-enable_mem_profile=no
-enable_debug_symbols=yes
-enable_binaries=yes
-enable_heterogeneous=no
-enable_picky=yes
-enable_debug=yes
-enable_shared=no
-enable_static=yes
-enable_memchecker=no
-enable_ipv6=yes
-enable_mpi_fortran=no
-enable_mpi_cxx=no
-enable_mpi_cxx_seek=no
-enable_cxx_exceptions=no
-enable_per_user_config_files=no
-enable_script_wrapper_compilers=no
-enable_orterun_prefix_by_default=yes
-enable_io_romio=no
-enable_mca_no_build=carto,crs,snapc,crcp,paffinity,ess-alps,ess-cnos,ess-lsf,ess-portals_utcp,ess-singleton,ess-slave,ess-slurm,ess-slurmd,ess-tm,ess-tool,filem,grpcomm-basic,grpcomm-cnos,grpcomm-hier,notifier,rmaps-rank_file,rmaps-topo,rml-ftrm,routed-direct,routed-linear,routed-slave,timer-catamount,timer-aix,timer-altix,timer-solaris,timer-windows
-enable_contrib_no_build=libnbc,vt
-with_memory_manager=no
-with_tm=no
-with_devel_headers=yes
-with_portals=no
-with_valgrind=no
diff --git a/contrib/platform/cisco/linux-static.conf b/contrib/platform/cisco/linux-static.conf
deleted file mode 100644
index b57b07777a..0000000000
--- a/contrib/platform/cisco/linux-static.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-# This is the default system-wide MCA parameters defaults file.
-# Specifically, the MCA parameter "mca_param_files" defaults to a
-# value of
-# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
-# (this file is the latter of the two).  So if the default value of
-# mca_param_files is not changed, this file is used to set system-wide
-# MCA parameters.  This file can therefore be used to set system-wide
-# default MCA parameters for all users.  Of course, users can override
-# these values if they want, but this file is an excellent location
-# for setting system-specific MCA parameters for those users who don't
-# know / care enough to investigate the proper values for them.
-
-# Note that this file is only applicable where it is visible (in a
-# filesystem sense).  Specifically, MPI processes each read this file
-# during their startup to determine what default values for MCA
-# parameters should be used.  mpirun does not bundle up the values in
-# this file from the node where it was run and send them to all nodes;
-# the default value decisions are effectively distributed.  Hence,
-# these values are only applicable on nodes that "see" this file.  If
-# $sysconf is a directory on a local disk, it is likely that changes
-# to this file will need to be propagated to other nodes.  If $sysconf
-# is a directory that is shared via a networked filesystem, changes to
-# this file will be visible to all nodes that share this $sysconf.
-
-# The format is straightforward: one per line, mca_param_name =
-# rvalue.  Quoting is ignored (so if you use quotes or escape
-# characters, they'll be included as part of the value).  For example:
-
-# Disable run-time MPI parameter checking
-#   mpi_param_check = 0
-
-# Note that the value "~/" will be expanded to the current user's home
-# directory.  For example:
-
-# Change component loading path
-#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
-
-# See "ompi_info --param all all" for a full listing of Open MPI MCA
-# parameters available and their default values.
-#
-
-# Basic behavior to smooth startup
-orte_abort_timeout = 10 
-opal_set_max_sys_limits = 1
-
-# ORTE behavior
-orte_enable_recovery = 1
-orte_max_local_restarts = 1
-orte_max_global_restarts = 1
-rmaps = resilient
-orte_create_session_dirs = 0
-orte_enable_progress_threads = 1
-
-## Add the interface for out-of-band communication
-## and set it up
-#oob_tcp_listen_mode = listen_thread
-oob_tcp_sndbuf = 32768
-oob_tcp_rcvbuf = 32768
diff --git a/contrib/platform/cisco/linux.conf b/contrib/platform/cisco/linux.conf
deleted file mode 100644
index eee1eeb567..0000000000
--- a/contrib/platform/cisco/linux.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2009      Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-# This is the default system-wide MCA parameters defaults file.
-# Specifically, the MCA parameter "mca_param_files" defaults to a
-# value of
-# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
-# (this file is the latter of the two).  So if the default value of
-# mca_param_files is not changed, this file is used to set system-wide
-# MCA parameters.  This file can therefore be used to set system-wide
-# default MCA parameters for all users.  Of course, users can override
-# these values if they want, but this file is an excellent location
-# for setting system-specific MCA parameters for those users who don't
-# know / care enough to investigate the proper values for them.
-
-# Note that this file is only applicable where it is visible (in a
-# filesystem sense).  Specifically, MPI processes each read this file
-# during their startup to determine what default values for MCA
-# parameters should be used.  mpirun does not bundle up the values in
-# this file from the node where it was run and send them to all nodes;
-# the default value decisions are effectively distributed.  Hence,
-# these values are only applicable on nodes that "see" this file.  If
-# $sysconf is a directory on a local disk, it is likely that changes
-# to this file will need to be propagated to other nodes.  If $sysconf
-# is a directory that is shared via a networked filesystem, changes to
-# this file will be visible to all nodes that share this $sysconf.
-
-# The format is straightforward: one per line, mca_param_name =
-# rvalue.  Quoting is ignored (so if you use quotes or escape
-# characters, they'll be included as part of the value).  For example:
-
-# Disable run-time MPI parameter checking
-#   mpi_param_check = 0
-
-# Note that the value "~/" will be expanded to the current user's home
-# directory.  For example:
-
-# Change component loading path
-#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
-
-# See "ompi_info --param all all" for a full listing of Open MPI MCA
-# parameters available and their default values.
-#
-
-# Basic behavior to smooth startup
-orte_abort_timeout = 10 
-opal_set_max_sys_limits = 1
-
-# ORTE behavior
-orte_enable_recovery = 1
-orte_max_restarts = -1
-orte_create_session_dirs = 0
-sensor_heartbeat_rate = 0:0
-sensor_heartbeat_check = 0:0
-
-## Add the interface for out-of-band communication
-## and set it up
-#oob_tcp_listen_mode = listen_thread
-oob_tcp_sndbuf = 32768
-oob_tcp_rcvbuf = 32768
diff --git a/contrib/platform/cisco/macosx-dynamic b/contrib/platform/cisco/macosx-dynamic
deleted file mode 100644
index fb60180917..0000000000
--- a/contrib/platform/cisco/macosx-dynamic
+++ /dev/null
@@ -1,27 +0,0 @@
-enable_event_debug=yes
-enable_event_thread_support=yes
-enable_heartbeat=yes
-enable_multicast=yes
-enable_sensors=yes
-enable_opal_multi_threads=yes
-enable_ft_thread=no
-enable_mem_debug=yes
-enable_mem_profile=no
-enable_debug_symbols=yes
-enable_binaries=yes
-enable_heterogeneous=no
-enable_picky=yes
-enable_debug=yes
-enable_shared=yes
-enable_static=no
-enable_io_romio=no
-enable_ipv6=no
-enable_mpi_fortran=no
-enable_mpi_cxx=no
-enable_mpi_cxx_seek=no
-enable_memchecker=no
-enable_mca_no_build=carto,crs,memchecker,snapc,crcp,paffinity,filem,sstore,compress,rml-ftrm,db,notifier
-with_memory_manager=no
-with_devel_headers=yes
-with_xgrid=no
-with_slurm=no
diff --git a/contrib/platform/cisco/macosx-dynamic-optimized b/contrib/platform/cisco/macosx-dynamic-optimized
deleted file mode 100644
index 31fd960db1..0000000000
--- a/contrib/platform/cisco/macosx-dynamic-optimized
+++ /dev/null
@@ -1,27 +0,0 @@
-enable_event_thread_support=yes
-enable_heartbeat=yes
-enable_multicast=yes
-enable_sensors=yes
-enable_opal_multi_threads=yes
-enable_ft_thread=no
-enable_mem_debug=no
-enable_mem_profile=no
-enable_debug_symbols=no
-enable_binaries=yes
-enable_heterogeneous=no
-enable_picky=yes
-enable_debug=no
-enable_shared=yes
-enable_static=no
-enable_contrib_no_build=libnbc,vt
-enable_io_romio=no
-enable_ipv6=no
-enable_mpi_fortran=no
-enable_mpi_cxx=no
-enable_mpi_cxx_seek=no
-enable_memchecker=no
-enable_mca_no_build=carto,crs,memchecker,filem,plm-slurm,plm-xgrid,snapc,ess-slurm,sstore,compress
-with_memory_manager=no
-with_devel_headers=yes
-with_xgrid=no
-with_slurm=no
diff --git a/contrib/platform/cisco/macosx-dynamic-optimized.conf b/contrib/platform/cisco/macosx-dynamic-optimized.conf
deleted file mode 100644
index b8eec3edcb..0000000000
--- a/contrib/platform/cisco/macosx-dynamic-optimized.conf
+++ /dev/null
@@ -1,76 +0,0 @@
-#
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The University of Tennessee and The University
-#                         of Tennessee Research Foundation.  All rights
-#                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
-#                         University of Stuttgart.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-# This is the default system-wide MCA parameters defaults file.
-# Specifically, the MCA parameter "mca_param_files" defaults to a
-# value of
-# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
-# (this file is the latter of the two).  So if the default value of
-# mca_param_files is not changed, this file is used to set system-wide
-# MCA parameters.  This file can therefore be used to set system-wide
-# default MCA parameters for all users.  Of course, users can override
-# these values if they want, but this file is an excellent location
-# for setting system-specific MCA parameters for those users who don't
-# know / care enough to investigate the proper values for them.
-
-# Note that this file is only applicable where it is visible (in a
-# filesystem sense).  Specifically, MPI processes each read this file
-# during their startup to determine what default values for MCA
-# parameters should be used.  mpirun does not bundle up the values in
-# this file from the node where it was run and send them to all nodes;
-# the default value decisions are effectively distributed.  Hence,
-# these values are only applicable on nodes that "see" this file.  If
-# $sysconf is a directory on a local disk, it is likely that changes
-# to this file will need to be propagated to other nodes.  If $sysconf
-# is a directory that is shared via a networked filesystem, changes to
-# this file will be visible to all nodes that share this $sysconf.
-
-# The format is straightforward: one per line, mca_param_name =
-# rvalue.  Quoting is ignored (so if you use quotes or escape
-# characters, they'll be included as part of the value).  For example:
-
-# Disable run-time MPI parameter checking
-#   mpi_param_check = 0
-
-# Note that the value "~/" will be expanded to the current user's home
-# directory.  For example:
-
-# Change component loading path
-#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
-
-# See "ompi_info --param all all" for a full listing of Open MPI MCA
-# parameters available and their default values.
-#
-
-# Basic behavior to smooth startup
-mca_component_show_load_errors = 0
-orte_abort_timeout = 10 
-
-# ORTE behavior
-rmaps = resilient
-orte_create_session_dirs = 0
-orte_enable_recovery = 1
-orte_max_local_restarts = 1
-orte_max_global_restarts = 1
-
-## Add the interface for out-of-band communication
-## and set it up
-oob_tcp_listen_mode = listen_thread
-oob_tcp_sndbuf = 32768
-oob_tcp_rcvbuf = 32768
diff --git a/contrib/platform/cisco/macosx-dynamic.conf b/contrib/platform/cisco/macosx-dynamic.conf
deleted file mode 100644
index d104e7d9bf..0000000000
--- a/contrib/platform/cisco/macosx-dynamic.conf
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The University of Tennessee and The University
-#                         of Tennessee Research Foundation.  All rights
-#                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
-#                         University of Stuttgart.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-# This is the default system-wide MCA parameters defaults file.
-# Specifically, the MCA parameter "mca_param_files" defaults to a
-# value of
-# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
-# (this file is the latter of the two).  So if the default value of
-# mca_param_files is not changed, this file is used to set system-wide
-# MCA parameters.  This file can therefore be used to set system-wide
-# default MCA parameters for all users.  Of course, users can override
-# these values if they want, but this file is an excellent location
-# for setting system-specific MCA parameters for those users who don't
-# know / care enough to investigate the proper values for them.
-
-# Note that this file is only applicable where it is visible (in a
-# filesystem sense).  Specifically, MPI processes each read this file
-# during their startup to determine what default values for MCA
-# parameters should be used.  mpirun does not bundle up the values in
-# this file from the node where it was run and send them to all nodes;
-# the default value decisions are effectively distributed.  Hence,
-# these values are only applicable on nodes that "see" this file.  If
-# $sysconf is a directory on a local disk, it is likely that changes
-# to this file will need to be propagated to other nodes.  If $sysconf
-# is a directory that is shared via a networked filesystem, changes to
-# this file will be visible to all nodes that share this $sysconf.
-
-# The format is straightforward: one per line, mca_param_name =
-# rvalue.  Quoting is ignored (so if you use quotes or escape
-# characters, they'll be included as part of the value).  For example:
-
-# Disable run-time MPI parameter checking
-#   mpi_param_check = 0
-
-# Note that the value "~/" will be expanded to the current user's home
-# directory.  For example:
-
-# Change component loading path
-#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
-
-# See "ompi_info --param all all" for a full listing of Open MPI MCA
-# parameters available and their default values.
-#
-
-# Basic behavior to smooth startup
-orte_abort_timeout = 10 
-
-# ORTE behavior
-orte_enable_recovery = 1
-orte_max_restarts = -1
-orte_create_session_dirs = 0
-sensor_heartbeat_rate = 0:0
-sensor_heartbeat_check = 0:0
-
-## Add the interface for out-of-band communication
-## and set it up
-#oob_tcp_listen_mode = listen_thread
-oob_tcp_sndbuf = 32768
-oob_tcp_rcvbuf = 32768
diff --git a/contrib/platform/cisco/macosx-static b/contrib/platform/cisco/macosx-static
deleted file mode 100644
index 37aa443e15..0000000000
--- a/contrib/platform/cisco/macosx-static
+++ /dev/null
@@ -1,24 +0,0 @@
-enable_multicast=yes
-enable_opal_multi_threads=yes
-enable_ft_thread=no
-enable_mem_debug=yes
-enable_mem_profile=no
-enable_debug_symbols=yes
-enable_binaries=yes
-enable_heterogeneous=no
-enable_picky=yes
-enable_debug=yes
-enable_shared=no
-enable_static=yes
-enable_contrib_no_build=libnbc,vt
-enable_io_romio=no
-enable_ipv6=no
-enable_mpi_fortran=no
-enable_mpi_cxx=no
-enable_mpi_cxx_seek=no
-enable_memchecker=no
-enable_mca_no_build=carto,crs,memchecker,filem,plm-slurm,plm-xgrid,snapc
-with_memory_manager=no
-with_devel_headers=yes
-with_xgrid=no
-with_ft=orcm
diff --git a/contrib/platform/cisco/macosx-static.conf b/contrib/platform/cisco/macosx-static.conf
deleted file mode 100644
index b8ad32256d..0000000000
--- a/contrib/platform/cisco/macosx-static.conf
+++ /dev/null
@@ -1,71 +0,0 @@
-#
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The University of Tennessee and The University
-#                         of Tennessee Research Foundation.  All rights
-#                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
-#                         University of Stuttgart.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2006      Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-# This is the default system-wide MCA parameters defaults file.
-# Specifically, the MCA parameter "mca_param_files" defaults to a
-# value of
-# "$HOME/.openmpi/mca-params.conf:$sysconf/openmpi-mca-params.conf"
-# (this file is the latter of the two).  So if the default value of
-# mca_param_files is not changed, this file is used to set system-wide
-# MCA parameters.  This file can therefore be used to set system-wide
-# default MCA parameters for all users.  Of course, users can override
-# these values if they want, but this file is an excellent location
-# for setting system-specific MCA parameters for those users who don't
-# know / care enough to investigate the proper values for them.
-
-# Note that this file is only applicable where it is visible (in a
-# filesystem sense).  Specifically, MPI processes each read this file
-# during their startup to determine what default values for MCA
-# parameters should be used.  mpirun does not bundle up the values in
-# this file from the node where it was run and send them to all nodes;
-# the default value decisions are effectively distributed.  Hence,
-# these values are only applicable on nodes that "see" this file.  If
-# $sysconf is a directory on a local disk, it is likely that changes
-# to this file will need to be propagated to other nodes.  If $sysconf
-# is a directory that is shared via a networked filesystem, changes to
-# this file will be visible to all nodes that share this $sysconf.
-
-# The format is straightforward: one per line, mca_param_name =
-# rvalue.  Quoting is ignored (so if you use quotes or escape
-# characters, they'll be included as part of the value).  For example:
-
-# Disable run-time MPI parameter checking
-#   mpi_param_check = 0
-
-# Note that the value "~/" will be expanded to the current user's home
-# directory.  For example:
-
-# Change component loading path
-#   component_path = /usr/local/lib/openmpi:~/my_openmpi_components
-
-# See "ompi_info --param all all" for a full listing of Open MPI MCA
-# parameters available and their default values.
-#
-
-# Basic behavior to smooth startup
-orte_abort_timeout = 10 
-
-# ORTE behavior
-errmgr_base_enable_recovery = 1
-
-## Add the interface for out-of-band communication
-## and set it up
-#oob_tcp_listen_mode = listen_thread
-oob_tcp_sndbuf = 32768
-oob_tcp_rcvbuf = 32768