diff --git a/config/prte_check_moab.m4 b/config/prte_check_moab.m4
deleted file mode 100644
index 4b18e5c246..0000000000
--- a/config/prte_check_moab.m4
+++ /dev/null
@@ -1,76 +0,0 @@
-# -*- shell-script -*-
-#
-# 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) 2009-2020 Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2016      Los Alamos National Security, LLC. All rights
-#                         reserved.
-# Copyright (c) 2017-2019 Intel, Inc.  All rights reserved.
-# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
-# Copyright (c) 2022      Amazon.com, Inc. or its affiliates.
-#                         All Rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-# PRTE_CHECK_MOAB(prefix, [action-if-found], [action-if-not-found])
-# --------------------------------------------------------
-AC_DEFUN([PRTE_CHECK_MOAB],[
-        PRTE_VAR_SCOPE_PUSH([prte_check_moab_$1_save_CPPFLAGS prte_check_moab_$1_save_LDFLAGS prte_check_moab_$1_save_LIBS])
-
-        AC_ARG_WITH([moab],
-                    [AS_HELP_STRING([--with-moab],
-                                    [Build MOAB scheduler component (default: yes)])])
-        AC_ARG_WITH([moab-libdir],
-                    [AS_HELP_STRING([--with-moab-libdir=DIR],
-                    [Search for Moab libraries in DIR])])
-
-        prte_check_moab_happy="yes"
-        AS_IF([test "$with_moab" = "no"],
-              [prte_check_moab_happy=no])
-
-        prte_check_moab_$1_save_CPPFLAGS=$CPPFLAGS
-        prte_check_moab_$1_save_LDFLAGS=$LDFLAGS
-        prte_check_moab_$1_save_LIBS=$LIBS
-
-        AS_IF([test $prte_check_moab_happy = yes],
-              [OAC_CHECK_PACKAGE([moab],
-                                 [prte_check_moab],
-                                 [mapi.h],
-                                 [cmoab],
-                                 [MCCJobGetRemainingTime],
-                                 [],
-                                 [prte_check_moab_happy=no])])
-
-        CPPFLAGS=$prte_check_moab_$1_save_CPPFLAGS
-        LDFLAGS=$prte_check_moab_$1_save_LDFLAGS
-        LIBS=$prte_check_moab_$1_save_LIBS
-
-        PRTE_SUMMARY_ADD([Resource Managers], [Moab], [], [$prte_check_moab_SUMMARY])
-        PRTE_VAR_SCOPE_POP
-
-    if test $prte_check_moab_happy = yes ; then
-        $1_CPPFLAGS="[$]$1_CPPFLAGS $prte_check_moab_CPPFLAGS"
-        $1_LIBS="[$]$1_LIBS $prte_check_moab_LIBS"
-        $1_LDFLAGS="[$]$1_LDFLAGS $prte_check_moab_LDFLAGS"
-
-        AC_SUBST($1_CPPFLAGS)
-        AC_SUBST($1_LDFLAGS)
-        AC_SUBST($1_LIBS)
-    fi
-
-    AS_IF([test "$prte_check_moab_happy" = "yes"],
-          [$2],
-          [$3])
-])
diff --git a/config/prte_check_singularity.m4 b/config/prte_check_singularity.m4
deleted file mode 100644
index 9d61f97f28..0000000000
--- a/config/prte_check_singularity.m4
+++ /dev/null
@@ -1,57 +0,0 @@
-# -*- shell-script ; indent-tabs-mode:nil -*-
-#
-# Copyright (c) 2016-2019 Intel, Inc.  All rights reserved.
-# Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-# PRTE_CHECK_SINGULARITY()
-# --------------------------------------------------------
-AC_DEFUN([PRTE_CHECK_SINGULARITY],[
-    PRTE_VAR_SCOPE_PUSH([spath have_singularity])
-
-    AC_ARG_WITH([singularity],
-                [AS_HELP_STRING([--with-singularity(=DIR)],
-                                [Build support for the Singularity container, optionally adding DIR to the search path])])
-    spath=
-    AC_MSG_CHECKING([if Singularity is present])
-    AS_IF([test "$with_singularity" = "no"],
-          [AC_MSG_RESULT([no])],
-          [AC_MSG_RESULT([yes])
-           AS_IF([test -z "$with_singularity" || test "$with_singularity" = "yes"],
-                 [ # look for the singularity command in the default path
-                   AC_CHECK_PROG([SINGULARITY], [singularity], [singularity])
-                   AS_IF([test "$SINGULARITY" != ""],
-                         [spath=DEFAULT],
-                         [AS_IF([test "$with_singularity" = "yes"],
-                                [AC_MSG_WARN([Singularity support requested, but required executable])
-                                 AC_MSG_WARN(["singularity" not found in default locations])
-                                 AC_MSG_ERROR([Cannot continue])])])],
-                 [ AC_MSG_CHECKING([for existence of $with_singularity/bin])
-                   # look for the singularity command in the bin subdirectory
-                   AS_IF([test ! -d "$with_singularity/bin"],
-                         [AC_MSG_RESULT([not found])
-                          AC_MSG_WARN([Directory $with_singularity/bin not found])
-                          AC_MSG_ERROR([Cannot continue])],
-                         [AC_MSG_RESULT([found])])
-                   save_path=$PATH
-                   PATH=$with_singularity/bin:$PATH
-                   AC_CHECK_PROG([SINGULARITY], [singularity], [singularity])
-                   AS_IF([test "$SINGULARITY" != ""],
-                         [spath=$with_singularity/bin],
-                         [AC_MSG_WARN([Singularity support requested, but required executable])
-                          AC_MSG_WARN(["singularity" not found in either default or specified path])
-                          AC_MSG_ERROR([Cannot continue])])
-                   PATH=$save_path
-                 ]
-           )])
-
-    AC_DEFINE_UNQUOTED(PRTE_SINGULARITY_PATH, "$spath", [Path to Singularity binaries])
-
-    PRTE_VAR_SCOPE_POP
-])