diff --git a/.gitignore b/.gitignore
index e1d8b168fe..665dc95ca5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,7 +161,6 @@ src/tools/prte/prte
 src/tools/pcc/pcc
 src/tools/pcc/pcc-wrapper-data.txt
 src/tools/pterm/pterm
-src/tools/psched/psched
 
 src/util/hostfile/hostfile_lex.c
 src/util/keyval/keyval_lex.c
diff --git a/config/prte_config_files.m4 b/config/prte_config_files.m4
index ef3f2eb2e1..a36180538b 100644
--- a/config/prte_config_files.m4
+++ b/config/prte_config_files.m4
@@ -4,7 +4,7 @@
 # Copyright (c) 2016-2020 Intel, Inc.  All rights reserved.
 # Copyright (c) 2019      Research Organization for Information Science
 #                         and Technology (RIST).  All rights reserved.
-# Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
+# Copyright (c) 2022-2024 Nanook Consulting  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -26,6 +26,5 @@ AC_DEFUN([PRTE_CONFIG_FILES],[
         src/tools/prte_info/Makefile
         src/tools/prte/Makefile
         src/tools/pterm/Makefile
-        src/tools/psched/Makefile
     ])
 ])
diff --git a/config/prte_setup_pmix.m4 b/config/prte_setup_pmix.m4
index 4c85405519..bbb5396507 100644
--- a/config/prte_setup_pmix.m4
+++ b/config/prte_setup_pmix.m4
@@ -79,10 +79,6 @@ AC_DEFUN([PRTE_CHECK_PMIX],[
                   [AS_HELP_STRING([--disable-pmix-lib-checks],
                                   [If --disable-pmix-lib-checks is specified, configure will assume that -lpmix is available])])
 
-    AC_ARG_WITH(prte-scheduler,
-        AS_HELP_STRING([--with-prte-scheduler],
-                       [Normal PRTE users/applications do not need this.  Users/applications wishing to explore dynamic allocation support probably do (default: enabled).]))
-
     prte_pmix_support=1
 
     if test "$with_pmix" = "no"; then
@@ -181,35 +177,5 @@ AC_DEFUN([PRTE_CHECK_PMIX],[
 
     PRTE_SUMMARY_ADD([Required Packages], [PMIx], [], [$prte_pmix_SUMMARY])
 
-    #
-    # Do we want to install the PRRTE scheduler?
-    #
-    AC_MSG_CHECKING([if want to install PRRTE pseudo-scheduler])
-    if test "$prte_pmix_low_version" = "0"; then
-        if test "$with_prte_scheduler" = "no"; then
-            AC_MSG_RESULT([no])
-            prte_want_scheduler="no"
-            WANT_PRTE_SCHED=0
-        else
-            AC_MSG_RESULT([yes])
-            prte_want_scheduler="yes"
-            WANT_PRTE_SCHED=1
-        fi
-    else
-        if test "$with_prte_scheduler" = "yes"; then
-            AC_MSG_RESULT([yes])
-            AC_MSG_WARN([Pseudo-scheduler requested, but PMIx version])
-            AC_MSG_WARN([is too low. Please reconfigure with a version])
-            AC_MSG_WARN([of at least v6.0])
-            AC_MSG_ERROR([Cannot continue.])
-        else
-            prte_want_scheduler="no"
-            WANT_PRTE_SCHED=0
-        fi
-    fi
-    AM_CONDITIONAL(WANT_PRTE_SCHED, test "$WANT_PRTE_SCHED" = 1)
-    PRTE_SUMMARY_ADD([Miscellaneous], [PRTE Pseudo-Scheduler], [], [$prte_want_scheduler])
-
-
     PRTE_VAR_SCOPE_POP
 ])
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6ef9e92e61..ce4651bb8f 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -68,7 +68,6 @@ PRTE_MAN1 = \
         prted.1 \
         prterun.1 \
         prun.1 \
-        psched.1 \
         pterm.1
 
 PRTE_MAN5 = \
diff --git a/docs/how-things-work/schedulers/index.rst b/docs/how-things-work/schedulers/index.rst
index 564a554ff8..ad11445307 100644
--- a/docs/how-things-work/schedulers/index.rst
+++ b/docs/how-things-work/schedulers/index.rst
@@ -3,8 +3,7 @@ Scheduler Integration
 =====================
 
 This section describes PRRTE support for interactions
-with schedulers, including PRRTE's own ``psched``
-pseudo-scheduler.
+with schedulers.
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/how-things-work/schedulers/overview.rst b/docs/how-things-work/schedulers/overview.rst
index bc0bd38f7c..51750c31ce 100644
--- a/docs/how-things-work/schedulers/overview.rst
+++ b/docs/how-things-work/schedulers/overview.rst
@@ -6,18 +6,3 @@ operations as a means of providing users and researchers with an environment wit
 which they can investigate/explore dynamic operations. It will , of course, interact
 with any PMIx-based scheduler to support allocation requests and directives for
 executing jobs within an allocation.
-
-In addition, however, PRRTE provides a pseudo-scheduler for research purposes. The
-``psched`` daemon is not a full scheduler - i.e., it does not provide even remotely
-optimal resource assignments, nor is it in any way production qualified. For example,
-the ``psched`` algorithms are not particularly fast and are focused more on providing
-functionality than supporting large volumes of requests.
-
-Within that context, ``psched`` will:
-
-* assemble a resource pool based on the usual PRRTE resource discovery methods. This
-  includes reading the allocation made by a host environment, or provided by hostfile
-  and/or dash-host command line options.
-
-* upon receipt of allocation requests (either directly from tools or relayed by PRRTE),
-  check to see if the specified resources are available.
diff --git a/docs/man/man1/index.rst b/docs/man/man1/index.rst
index da27174695..a1d2e7beb0 100644
--- a/docs/man/man1/index.rst
+++ b/docs/man/man1/index.rst
@@ -9,5 +9,4 @@ Commands (section 1)
    prted.1.rst
    prterun.1.rst
    prun.1.rst
-   psched.1.rst
    pterm.1.rst
diff --git a/docs/man/man1/psched.1.rst b/docs/man/man1/psched.1.rst
deleted file mode 100644
index 2f44d3c548..0000000000
--- a/docs/man/man1/psched.1.rst
+++ /dev/null
@@ -1,189 +0,0 @@
-.. _man1-psched:
-
-psched
-======
-
-psched |mdash| a modest scheduler for PRRTE
-
-SYNOPSIS
---------
-
-.. code:: sh
-
-   shell$ psched ...options...
-
-DESCRIPTION
------------
-
-``psched`` is a standalone daemon that acts as a dynamic
-scheduler for PRRTE.
-
-Extensive help documentation for this command is provided through
-``psched --help [topic]``.
-
-COMMAND LINE OPTIONS
---------------------
-The following command line options are recognized by ``psched``.
-
-General command line options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. include:: /prrte-rst-content/cli-general.rst
-
-MCA parameters
-^^^^^^^^^^^^^^
-
-* ``--pmixmca <key> <value>``: Pass context-specific PMIx MCA
-  parameters (``<key>>`` is the parameter name; ``<value>`` is the
-  parameter value).
-  :ref:`See below for details <label-psched-pmixmca>`.
-
-* ``--prtemca <key> <value>``: Pass context-specific PRRTE MCA
-  parameters to the scheduler.
-  :ref:`See below for details <label-psched-prtemca>`.
-
-* ``--tune <filename>``: File(s) containing MCA params for tuning
-  scheduler operations.
-  :ref:`See below for details <label-psched-tune>`.
-
-Output options
-^^^^^^^^^^^^^^
-
-* ``--output <list>``: Comma-delimited list of options that control
-  how output is generated.  :ref:`See below for details
-  <label-psched-output>`.
-
-* ``--stream-buffering <value>``: Control how output is buffered.
-  :ref:`See below for details <label-psched-stream-buffering>`.
-
-Resource options
-^^^^^^^^^^^^^^^^
-
-* ``--default-hostfile <filename>``: Provide a default hostfile.
-
-* ``-H`` | ``--host <list>``: Comma-delimited list of hosts to be
-  included in scheduler queues
-  :ref:`See below for details <label-psched-host>`.
-
-* ``--hostfile <filename>``: Provide a hostfile.
-  :ref:`See below for details <label-psched-hostfile>`.
-
-* ``--machinefile <filename>``: Synonym for ``--hostfile``.
-
-
-Specific options
-^^^^^^^^^^^^^^^^
-
-* ``--allow-run-as-root``: Allow execution as root **(STRONGLY
-  DISCOURAGED)**.  :ref:`See below for details
-  <label-psched-allow-run-as-root>`.
-
-* ``--daemonize``: Daemonize the scheduler into the background.
-
-* ``--no-ready-msg``: Do not output a "ready" message when the
-  scheduler has completed initializing.
-
-* ``--set-sid``: Direct the scheduler to separate from the current
-  session.
-
-* ``--tmpdir <dir>``: Set the root for the session directory tree.
-
-* ``--report-pid <value>``: Print out PID on stdout (``-``), stderr
-  (``+``), or a filename (anything else)
-
-* ``--report-uri <value>``: Print out URI on stdout (``-``), stderr
-  (``+``), or a filename (anything else)
-
-* ``--keepalive <filename>``: Named pipe filename to monitor |mdash|
-  ``psched`` will terminate upon closure
-
-
-Debug options
-^^^^^^^^^^^^^
-
-* ``--debug``: Synonym for ``--leave-session-attached``
-
-* ``--leave-session-attached``: Do not discard stdout/stderr of remote
-  PRTE daemons.
-  :ref:`See below for details <label-psched-leave-session-attached>`.
-
-
-Details of individual command line options
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The sections below offer more detail than the abbreviated lists,
-above.
-
-.. _label-psched-pmixmca:
-
-The ``--pmixmca`` option
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-pmixmca.rst
-
-.. _label-psched-prtemca:
-
-The ``--prtemca`` option
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-prtemca.rst
-
-.. _label-psched-tune:
-
-The ``--tune`` option
-~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-tune.rst
-
-.. _label-psched-allow-run-as-root:
-
-The ``--allow-run-as-root`` option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-allow-run-as-root.rst
-
-.. _label-psched-output:
-
-The ``--output`` option
-~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-output.rst
-
-.. _label-psched-stream-buffering:
-
-The ``--stream-buffering`` option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-stream-buffering.rst
-
-.. _label-psched-host:
-
-The ``--host`` option
-~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-dash-host.rst
-
-.. _label-psched-hostfile:
-
-The ``--hostfile`` option
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-dvm-hostfile.rst
-
-.. _label-psched-leave-session-attached:
-
-The ``--leave-session-attached`` option
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-leave-session-attached.rst
-
-.. _label-psched-display:
-
-The ``--display`` option
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. include:: /prrte-rst-content/cli-display.rst
-
-
-.. seealso::
-   :ref:`prte(1) <man1-prte>`
diff --git a/docs/session-directory.rst b/docs/session-directory.rst
index 8f47a635fd..cfc93059f2 100644
--- a/docs/session-directory.rst
+++ b/docs/session-directory.rst
@@ -46,7 +46,7 @@ By default, the session directory name is set to
 
 where `tool` is the argv[0] of the process setting up the
 session directory. In most cases, this will be either `prte`,
-`prterun`, or `prted` - though special tools such as `psched`
+`prterun`, or `prted` - though special tools
 may also create a session directory tree.
 
 The session directory name includes the PID
diff --git a/src/docs/Makefile.am b/src/docs/Makefile.am
index 5abad91a24..6e4b0b85e0 100644
--- a/src/docs/Makefile.am
+++ b/src/docs/Makefile.am
@@ -38,7 +38,6 @@ dist_prtedata_DATA = \
         show-help-files/help-prted.txt \
         show-help-files/help-prterun.txt \
         show-help-files/help-prun.txt \
-        show-help-files/help-psched.txt \
         show-help-files/help-pterm.txt \
         show-help-files/help-ras-base.txt \
         show-help-files/help-ras-pbs.txt \
diff --git a/src/docs/show-help-files/help-psched.txt b/src/docs/show-help-files/help-psched.txt
deleted file mode 100644
index 2729587657..0000000000
--- a/src/docs/show-help-files/help-psched.txt
+++ /dev/null
@@ -1,318 +0,0 @@
-[bogus section]
-
-This section is not used by PRTE code.  But we have to put a RST
-section title in this file somewhere, or Sphinx gets unhappy.  So we
-put it in a section that is ignored by PRTE code.
-
-
-Hello, world
-============
-
-[usage]
-
-%s (%s) %s
-
-Usage: %s [OPTION]...
-
-The following list of command line options are available. Note that
-more detailed help for any option can be obtained by adding that
-option to the help request as "--help <option>".
-
-+----------------------+-----------------------------------------------+
-|                      | General Options                               |
-+----------------------+-----------------------------------------------+
-| Option               | Description                                   |
-|======================|===============================================|
-| "-h" | "--help"      | This help message                             |
-+----------------------+-----------------------------------------------+
-| "-h" | "--help       | Help for the specified option                 |
-| <arg0>"              |                                               |
-+----------------------+-----------------------------------------------+
-| "-v" | "--verbose"   | Enable typical debug options                  |
-+----------------------+-----------------------------------------------+
-| "-V" | "--version"   | Print version and exit                        |
-+----------------------+-----------------------------------------------+
-| "--pmixmca <key>     | Pass context-specific PMIx MCA parameters;    |
-| <value>"             | they are considered global if only one        |
-|                      | context is specified ("key" is the parameter  |
-|                      | name; "value" is the parameter value)         |
-+----------------------+-----------------------------------------------+
-| "--prtemca <key>     | Pass context-specific PRTE MCA parameters;    |
-| <value>"             | they are considered global if "--gmca" is not |
-|                      | used and only one context is specified ("key" |
-|                      | is the parameter name; "value" is the         |
-|                      | parameter value)                              |
-+----------------------+-----------------------------------------------+
-| "--tune <files>"     | File(s) containing MCA params for tuning      |
-|                      | scheduler operations                          |
-+----------------------+-----------------------------------------------+
-
-+----------------------+-----------------------------------------------+
-|                      | Resource Options                              |
-+----------------------+-----------------------------------------------+
-| Option               | Description                                   |
-|======================|===============================================|
-| "--default-hostfile  | Provide a default hostfile                    |
-| <filename>"          |                                               |
-+----------------------+-----------------------------------------------+
-| "-H" | "--host       | List of hosts to invoke processes on          |
-| <hosts>"             |                                               |
-+----------------------+-----------------------------------------------+
-| "--hostfile <file>"  | Provide a hostfile                            |
-+----------------------+-----------------------------------------------+
-| "--machinefile       | Provide a hostfile (synonym for "--hostfile") |
-| <file>"              |                                               |
-+----------------------+-----------------------------------------------+
-
-+----------------------+-----------------------------------------------+
-|                      | Specific Options                              |
-+----------------------+-----------------------------------------------+
-| Option               | Description                                   |
-|======================|===============================================|
-| "--allow-run-as-     | Allow execution as root (**STRONGLY           |
-| root"                | DISCOURAGED**)                                |
-+----------------------+-----------------------------------------------+
-| "--daemonize"        | Daemonize the scheduler into the background   |
-+----------------------+-----------------------------------------------+
-| "--no-ready-msg"     | Do not print a "DVM ready" message            |
-+----------------------+-----------------------------------------------+
-| "--set-sid"          | Direct the scheduler to separate from the     |
-|                      | current session                               |
-+----------------------+-----------------------------------------------+
-| "--tmpdir <dir>"     | Set the filesystem root for the session       |
-|                      | directory tree                                |
-+----------------------+-----------------------------------------------+
-| "--report-pid <arg>" | Print out PID on stdout ("-"), stderr ("+"),  |
-|                      | or a file (anything else)                     |
-+----------------------+-----------------------------------------------+
-| "--report-uri <arg>" | Print out URI on stdout ("-"), stderr ("+"),  |
-|                      | or a file (anything else)                     |
-+----------------------+-----------------------------------------------+
-| "--keepalive <arg0>" | Pipe to monitor - scheduler will terminate    |
-|                      | upon closure                                  |
-+----------------------+-----------------------------------------------+
-
-Report bugs to %s
-
-[version]
-
-%s (%s) %s
-
-Report bugs to %s
-
-[pmixmca]
-
-Pass a PMIx MCA parameter
-
-Syntax: "--pmixmca <key> <value>", where "key" is the parameter name
-and "value" is the parameter value.
-
-[prtemca]
-
-Pass a PRRTE MCA parameter.
-
-Syntax: "--prtemca <key> <value>", where "key" is the parameter name
-and "value" is the parameter value.
-
-[tune]
-
-Comma-delimited list of one or more files containing PRRTE and PMIx
-MCA params for tuning DVM and/or application operations. Parameters in
-the file will be treated as *generic* parameters and subject to the
-translation rules/uncertainties.  See "--help mca" for more
-information.
-
-Syntax in the file is:
-
-   param = value
-
-with one parameter and its associated value per line. Empty lines and
-lines beginning with the "#" character are ignored, as is any
-whitespace around the "=" character.
-
-[default-hostfile]
-
-Specify a default hostfile.
-
-Also see "--help hostfile".
-
-[host]
-
-Host syntax consists of a comma-delimited list of node names, each
-entry optionally containing a ":N" extension indicating the number of
-slots to assign to that entry:
-
-   --host node01:5,node02
-
-In the absence of the slot extension, one slot will be assigned to the
-node. Duplicate entries are aggregated and the number of slots
-assigned to that node are summed together.
-
-Note:
-
-  A "slot" is the PRRTE term for an allocatable unit where we can
-  launch a process. Thus, the number of slots equates to the maximum
-  number of processes PRRTE may start on that node without
-  oversubscribing it.
-
-[hostfile]
-
-PRRTE supports several levels of user-specified host lists based on an
-established precedence order. Users can specify a default hostfile
-that contains a list of nodes to be used by the DVM. Only one default
-hostfile can be provided for a given DVM. In addition, users can
-specify a hostfile that contains a list of nodes to be used for a DVM,
-or can provide a comma-delimited list of nodes to be used for that DVM
-via the "--host" command line option.
-
-The precedence order applied to these various options depends to some
-extent on the local environment. The following table illustrates how
-host and hostfile directives work together to define the set of hosts
-upon which a DVM will execute in the absence of a resource manager
-(RM):
-
-+------------+---------+------------+----------------------------------+
-| Default    | host    | hostfile   | Result                           |
-| hostfile   |         |            |                                  |
-|============|=========|============|==================================|
-| unset      | unset   | unset      | The DVN will consist solely of   |
-|            |         |            | the local host where the DVM was |
-|            |         |            | started.                         |
-+------------+---------+------------+----------------------------------+
-| unset      | set     | unset      | Host option defines resource     |
-|            |         |            | list for the DVM.                |
-+------------+---------+------------+----------------------------------+
-| unset      | unset   | set        | Hostfile option defines resource |
-|            |         |            | list for the DVM.                |
-+------------+---------+------------+----------------------------------+
-| unset      | set     | set        | Hostfile option defines resource |
-|            |         |            | list for the DVM, then host      |
-|            |         |            | filters the list to define the   |
-|            |         |            | final set of nodes to be used by |
-|            |         |            | the DVM                          |
-+------------+---------+------------+----------------------------------+
-| set        | unset   | unset      | Default hostfile defines         |
-|            |         |            | resource list for the DVM        |
-+------------+---------+------------+----------------------------------+
-| set        | set     | unset      | Default hostfile defines         |
-|            |         |            | resource list for the DVM, then  |
-|            |         |            | host filters the list to define  |
-|            |         |            | the final set of nodes to be     |
-|            |         |            | used by the DVM                  |
-+------------+---------+------------+----------------------------------+
-| set        | set     | set        | Default hostfile defines         |
-|            |         |            | resource list for the DVM, then  |
-|            |         |            | hostfile filters the list, and   |
-|            |         |            | then host filters the list to    |
-|            |         |            | define the final set of nodes to |
-|            |         |            | be used by the DVM               |
-+------------+---------+------------+----------------------------------+
-
-This changes somewhat in the presence of an RM as that entity
-specifies the initial allocation of nodes. In this case, the default
-hostfile, hostfile and host directives are all used to filter the RM's
-specification so that a user can utilize different portions of the
-allocation for different DVMs. This is done according to the same
-precedence order as in the prior table, with the RM providing the
-initial pool of nodes.
-
-Hostfiles (sometimes called "machine files") are a combination of two
-things:
-
-1. A listing of hosts on which to launch processes.
-
-2. Optionally, limit the number of processes which can be launched on
-   each host.
-
-Hostfile syntax consists of one node name on each line, optionally
-including a designated number of "slots":
-
-   # This is a comment line, and will be ignored
-   node01  slots=10
-   node13  slots=5
-
-   node15
-   node16
-   node17  slots=3
-   ...
-
-Blank lines and lines beginning with a "#" are ignored.
-
-A "slot" is the PRRTE term for an allocatable unit where we can launch
-a process.  See the section on definition of the term "slot" for a
-longer description of slots.
-
-In the absence of the "slot" parameter, PRRTE will assign either the
-number of slots to be the number of CPUs detected on the node or the
-resource manager-assigned value if operating in the presence of an RM.
-
-Important:
-
-  If using a resource manager, the user-specified number of slots is
-  capped by the RM-assigned value.
-
-See the "Host specification" HTML documentation for details about the
-format and content of hostfiles.
-
-[machinefile]
-
-Provide a hostfile.  This option is a synonym for "--hostfile"; see
-that option for more information.
-
-[allow-run-as-root]
-
-Allow execution as root **(STRONGLY DISCOURAGED)**.
-
-Running as root exposes the user to potentially catastrophic file
-system corruption and damage — e.g., if the user accidentally points
-the root of the session directory to a system required point, this
-directory and all underlying elements will be deleted upon job
-completion, thereby rendering the system inoperable.
-
-It is recognized that some environments (e.g., containers) may require
-operation as root, and that the user accepts the risks in those
-scenarios. Accordingly, one can override PRRTE's run-as-root
-protection by providing one of the following:
-
-* The "--allow-run-as-root" command line directive
-
-* Adding **BOTH** of the following environmental parameters:
-
-     * "PRTE_ALLOW_RUN_AS_ROOT=1"
-
-     * "PRTE_ALLOW_RUN_AS_ROOT_CONFIRM=1"
-
-Again, we recommend this only be done if absolutely necessary.
-
-[daemonize]
-
-Daemonize the scheduler into the background
-
-[no-ready-msg]
-
-Do not print a scheduler ready message
-
-[set-sid]
-
-Direct the scheduler to separate from the current session
-
-[tmpdir]
-
-Define the root location for the PRRTE session directory tree
-
-See the "Session directory" HTML documentation for additional details
-about the PRRTE session directory.
-
-[report-pid]
-
-Printout scheduler's PID on stdout [-], stderr [+], or a file
-[anything else]
-
-[report-uri]
-
-Printout scheduler's URI on stdout [-], stderr [+], or a file
-[anything else]
-
-[keepalive]
-
-Pipe for scheduler to monitor - scheduler will terminate upon closure
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 1ff74f6399..040bee8e9c 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -14,7 +14,7 @@
 # Copyright (c) 2011-2013 Los Alamos National Security, LLC.  All rights
 #                         reserved.
 # Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
-# Copyright (c) 2023      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2023-2024 Nanook Consulting  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -33,16 +33,10 @@ SUBDIRS += \
     tools/prte \
     tools/pterm
 
-if WANT_PRTE_SCHED
-SUBDIRS += \
-    tools/psched
-endif
-
 DIST_SUBDIRS += \
 	tools/prted \
 	tools/prun \
 	tools/pcc \
     tools/prte_info \
     tools/prte \
-    tools/pterm \
-    tools/psched
+    tools/pterm
diff --git a/src/tools/psched/Makefile.am b/src/tools/psched/Makefile.am
deleted file mode 100644
index b047d74812..0000000000
--- a/src/tools/psched/Makefile.am
+++ /dev/null
@@ -1,67 +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-2009 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) 2007-2020 Cisco Systems, Inc.  All rights reserved
-# Copyright (c) 2008      Sun Microsystems, Inc.  All rights reserved.
-# Copyright (c) 2016-2020 Intel, Inc.  All rights reserved.
-# Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
-# Copyright (c) 2023      Jeffrey M. Squyres.  All rights reserved.
-# $COPYRIGHT$
-#
-# Additional copyrights may follow
-#
-# $HEADER$
-#
-
-AM_LDFLAGS = $(prte_hwloc_LDFLAGS) $(prte_libevent_LDFLAGS) $(prte_pmix_LDFLAGS)
-AM_CFLAGS = \
-            -DPRTE_CONFIGURE_USER="\"@PRTE_CONFIGURE_USER@\"" \
-            -DPRTE_CONFIGURE_HOST="\"@PRTE_CONFIGURE_HOST@\"" \
-            -DPRTE_CONFIGURE_DATE="\"@PRTE_CONFIGURE_DATE@\"" \
-            -DPRTE_BUILD_USER="\"$$USER\"" \
-            -DPRTE_BUILD_HOST="\"$${HOSTNAME:-`(hostname || uname -n) | sed 1q`}\"" \
-            -DPRTE_BUILD_DATE="\"`$(top_srcdir)/config/getdate.sh`\"" \
-            -DPRTE_BUILD_CFLAGS="\"@CFLAGS@\"" \
-            -DPRTE_BUILD_CPPFLAGS="\"@CPPFLAGS@\"" \
-            -DPRTE_BUILD_LDFLAGS="\"@LDFLAGS@\"" \
-            -DPRTE_BUILD_LIBS="\"@LIBS@\"" \
-            -DPRTE_CC_ABSOLUTE="\"@PRTE_CC_ABSOLUTE@\"" \
-            -DPRTE_GREEK_VERSION="\"@PRTE_GREEK_VERSION@\"" \
-            -DPRTE_REPO_REV="\"@PRTE_REPO_REV@\"" \
-            -DPMIX_RELEASE_DATE="\"@PMIX_RELEASE_DATE@\""
-
-bin_PROGRAMS = psched
-
-psched_SOURCES = \
-	psched.h \
-	psched.c \
-	errmgr.c \
-	state.c \
-	server.c \
-	scheduler.c \
-	backend.c \
-	event.c \
-	queries.c \
-	schizo.c \
-	session.c
-
-# the following empty psched_LDFLAGS is used
-#  so that the psched can be compiled statically
-#  by simply changing the value of this from
-#  nothing to -all-static in the Makefile.in
-#  nice for systems that don't have all the shared
-#  libraries on the computes
-psched_LDFLAGS =
-psched_LDADD = \
-    $(prte_libevent_LIBS) \
-    $(prte_hwloc_LIBS) \
-    $(prte_pmix_LIBS) \
-	$(top_builddir)/src/libprrte.la
diff --git a/src/tools/psched/backend.c b/src/tools/psched/backend.c
deleted file mode 100644
index 4e86676ab9..0000000000
--- a/src/tools/psched/backend.c
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2011 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-2013 Los Alamos National Security, LLC.
- *                         All rights reserved.
- * Copyright (c) 2009-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2017 Mellanox Technologies, Inc.
- *                         All rights reserved.
- * Copyright (c) 2014-2019 Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2020      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2024 Nanook Consulting.  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- *
- */
-
-#include "prte_config.h"
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#include <fcntl.h>
-
-#include "src/hwloc/hwloc-internal.h"
-#include "src/pmix/pmix-internal.h"
-#include "src/util/pmix_argv.h"
-#include "src/util/pmix_os_dirpath.h"
-#include "src/util/pmix_output.h"
-
-#include "src/mca/errmgr/errmgr.h"
-#include "src/mca/grpcomm/base/base.h"
-#include "src/mca/iof/base/base.h"
-#include "src/mca/iof/iof.h"
-#include "src/mca/plm/base/plm_private.h"
-#include "src/mca/plm/plm.h"
-#include "src/mca/plm/base/plm_private.h"
-#include "src/mca/rmaps/rmaps_types.h"
-#include "src/rml/rml.h"
-#include "src/mca/schizo/schizo.h"
-#include "src/mca/state/state.h"
-#include "src/runtime/prte_globals.h"
-#include "src/runtime/prte_locks.h"
-#include "src/threads/pmix_threads.h"
-#include "src/util/name_fns.h"
-#include "src/util/pmix_show_help.h"
-
-#include "src/prted/pmix/pmix_server_internal.h"
-#include "src/tools/psched/psched.h"
-
-static void opcbfunc(pmix_status_t status, void *cbdata)
-{
-    prte_pmix_lock_t *lock = (prte_pmix_lock_t *) cbdata;
-
-    lock->status = prte_pmix_convert_status(status);
-    PRTE_PMIX_WAKEUP_THREAD(lock);
-}
-
-/* add any info that the tool couldn't self-assign */
-static int register_tool(pmix_nspace_t nspace)
-{
-    pmix_status_t ret;
-    prte_pmix_lock_t lock;
-    int rc;
-    prte_pmix_tool_t *tl;
-
-    /* record this tool */
-    tl = PMIX_NEW(prte_pmix_tool_t);
-    PMIX_LOAD_PROCID(&tl->name, nspace, 0);
-    pmix_list_append(&psched_globals.tools, &tl->super);
-
-    PRTE_PMIX_CONSTRUCT_LOCK(&lock);
-    ret = PMIx_server_register_nspace(nspace, 1, NULL, 0,
-                                      opcbfunc, &lock);
-    if (PMIX_SUCCESS != ret) {
-        PMIX_ERROR_LOG(ret);
-        rc = prte_pmix_convert_status(ret);
-        PRTE_PMIX_DESTRUCT_LOCK(&lock);
-        return rc;
-    }
-    PRTE_PMIX_WAIT_THREAD(&lock);
-    rc = lock.status;
-    PRTE_PMIX_DESTRUCT_LOCK(&lock);
-    return rc;
-}
-
-static void _toolconn(int sd, short args, void *cbdata)
-{
-    pmix_server_req_t *cd = (pmix_server_req_t *) cbdata;
-    int rc;
-    size_t n;
-    pmix_status_t xrc;
-    PRTE_HIDE_UNUSED_PARAMS(sd, args);
-
-    PMIX_ACQUIRE_OBJECT(cd);
-
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
-                        "%s PROCESSING TOOL CONNECTION",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    /* check for directives */
-    if (NULL != cd->info) {
-        for (n = 0; n < cd->ninfo; n++) {
-            if (PMIX_CHECK_KEY(&cd->info[n], PMIX_EVENT_SILENT_TERMINATION)) {
-                cd->flag = PMIX_INFO_TRUE(&cd->info[n]);
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_VERSION_INFO)) {
-                /* we ignore this for now */
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_USERID)) {
-                PMIX_VALUE_GET_NUMBER(xrc, &cd->info[n].value, cd->uid, uid_t);
-                if (PMIX_SUCCESS != xrc) {
-                    if (NULL != cd->toolcbfunc) {
-                        cd->toolcbfunc(xrc, NULL, cd->cbdata);
-                    }
-                    PMIX_RELEASE(cd);
-                    return;
-                }
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_GRPID)) {
-                PMIX_VALUE_GET_NUMBER(xrc, &cd->info[n].value, cd->gid, gid_t);
-                if (PMIX_SUCCESS != xrc) {
-                    if (NULL != cd->toolcbfunc) {
-                        cd->toolcbfunc(xrc, NULL, cd->cbdata);
-                    }
-                    PMIX_RELEASE(cd);
-                    return;
-                }
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_NSPACE)) {
-                PMIX_LOAD_NSPACE(cd->target.nspace, cd->info[n].value.data.string);
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_RANK)) {
-                cd->target.rank = cd->info[n].value.data.rank;
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_HOSTNAME)) {
-                cd->operation = strdup(cd->info[n].value.data.string);
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_CMD_LINE)) {
-                cd->cmdline = strdup(cd->info[n].value.data.string);
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_LAUNCHER)) {
-                cd->launcher = PMIX_INFO_TRUE(&cd->info[n]);
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_SERVER_SYS_CONTROLLER)) {
-                cd->scheduler = PMIX_INFO_TRUE(&cd->info[n]);
-            } else if (PMIX_CHECK_KEY(&cd->info[n], PMIX_PROC_PID)) {
-                PMIX_VALUE_GET_NUMBER(xrc, &cd->info[n].value, cd->pid, pid_t);
-                if (PMIX_SUCCESS != xrc) {
-                    if (NULL != cd->toolcbfunc) {
-                        cd->toolcbfunc(xrc, NULL, cd->cbdata);
-                    }
-                    PMIX_RELEASE(cd);
-                    return;
-                }
-            }
-        }
-    }
-
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
-                        "%s %s CONNECTION FROM UID %d GID %d NSPACE %s",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                        cd->launcher ? "LAUNCHER" : (cd->scheduler ? "SYSTEM CONTROLLER" : "TOOL"),
-                        cd->uid, cd->gid, cd->target.nspace);
-
-    if (cd->scheduler) {
-        /* mark that the system controller has attached to us */
-        psched_globals.controller_connected = true;
-        PMIX_LOAD_PROCID(&psched_globals.syscontroller,
-                         cd->target.nspace, cd->target.rank);
-        /* we cannot immediately set the system controller to be our
-         * PMIx server as the PMIx library hasn't finished
-         * recording it */
-    }
-
-    /* if the tool doesn't already have a self-assigned name, then
-     * there isn't much we can do about it */
-    xrc = PMIX_SUCCESS;
-    if (PMIX_NSPACE_INVALID(cd->target.nspace) || PMIX_RANK_INVALID == cd->target.rank) {
-        xrc = PMIX_ERR_BAD_PARAM;
-    } else {
-        /* the tool is not a client of ours, but we can provide at least some information */
-        rc = register_tool(cd->target.nspace);
-        if (PRTE_SUCCESS != rc) {
-            xrc = prte_pmix_convert_rc(rc);
-        }
-    }
-    if (NULL != cd->toolcbfunc) {
-        cd->toolcbfunc(xrc, &cd->target, cd->cbdata);
-    }
-    PMIX_RELEASE(cd);
-}
-
-void psched_tool_connected_fn(pmix_info_t *info, size_t ninfo,
-                              pmix_tool_connection_cbfunc_t cbfunc,
-                              void *cbdata)
-{
-    pmix_server_req_t *cd;
-
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
-                        "%s TOOL CONNECTION REQUEST RECVD",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    /* need to threadshift this request */
-    cd = PMIX_NEW(pmix_server_req_t);
-    cd->info = info;
-    cd->ninfo = ninfo;
-    cd->toolcbfunc = cbfunc;
-    cd->cbdata = cbdata;
-    cd->target.rank = 0; // set default for tool
-
-    prte_event_set(prte_event_base, &(cd->ev), -1, PRTE_EV_WRITE, _toolconn, cd);
-    PMIX_POST_OBJECT(cd);
-    prte_event_active(&(cd->ev), PRTE_EV_WRITE, 1);
-}
-
-pmix_status_t psched_job_ctrl_fn(const pmix_proc_t *requestor,
-                                 const pmix_proc_t targets[], size_t ntargets,
-                                 const pmix_info_t directives[], size_t ndirs,
-                                 pmix_info_cbfunc_t cbfunc, void *cbdata)
-{
-    int rc, j;
-    int32_t signum;
-    size_t m, n;
-    prte_proc_t *proc;
-    pmix_nspace_t jobid;
-    pmix_pointer_array_t parray, *ptrarray;
-    pmix_data_buffer_t *cmd;
-    prte_daemon_cmd_flag_t cmmnd;
-    prte_grpcomm_signature_t *sig;
-    pmix_proc_t *proct;
-    PRTE_HIDE_UNUSED_PARAMS(cbfunc, cbdata);
-
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
-                        "%s job control request from %s:%d",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                        requestor->nspace, requestor->rank);
-
-    for (m = 0; m < ndirs; m++) {
-        if (0 == strncmp(directives[m].key, PMIX_JOB_CTRL_KILL, PMIX_MAX_KEYLEN)) {
-            /* convert the list of targets to a pointer array */
-            if (NULL == targets) {
-                ptrarray = NULL;
-            } else {
-                PMIX_CONSTRUCT(&parray, pmix_pointer_array_t);
-                for (n = 0; n < ntargets; n++) {
-                    if (PMIX_RANK_WILDCARD == targets[n].rank) {
-                        /* create an object */
-                        proc = PMIX_NEW(prte_proc_t);
-                        PMIX_LOAD_PROCID(&proc->name, targets[n].nspace, PMIX_RANK_WILDCARD);
-                    } else {
-                        /* get the proc object for this proc */
-                        if (NULL == (proc = prte_get_proc_object(&targets[n]))) {
-                            PRTE_ERROR_LOG(PRTE_ERR_NOT_FOUND);
-                            continue;
-                        }
-                        PMIX_RETAIN(proc);
-                    }
-                    pmix_pointer_array_add(&parray, proc);
-                }
-                ptrarray = &parray;
-            }
-            if (PRTE_SUCCESS != (rc = prte_plm.terminate_procs(ptrarray))) {
-                PRTE_ERROR_LOG(rc);
-            }
-            if (NULL != ptrarray) {
-                /* cleanup the array */
-                for (j = 0; j < parray.size; j++) {
-                    if (NULL != (proc = (prte_proc_t *) pmix_pointer_array_get_item(&parray, j))) {
-                        PMIX_RELEASE(proc);
-                    }
-                }
-                PMIX_DESTRUCT(&parray);
-            }
-        } else if (0 == strncmp(directives[m].key, PMIX_JOB_CTRL_TERMINATE, PMIX_MAX_KEYLEN)) {
-            if (NULL == targets) {
-                /* terminate the daemons and all running jobs */
-                PMIX_DATA_BUFFER_CREATE(cmd);
-                /* pack the command */
-                cmmnd = PRTE_DAEMON_HALT_VM_CMD;
-                rc = PMIx_Data_pack(NULL, cmd, &cmmnd, 1, PMIX_UINT8);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    PMIX_DATA_BUFFER_RELEASE(cmd);
-                    return rc;
-                }
-                /* goes to all daemons */
-                sig = PMIX_NEW(prte_grpcomm_signature_t);
-                sig->signature = (pmix_proc_t *) malloc(sizeof(pmix_proc_t));
-                sig->sz = 1;
-                PMIX_LOAD_PROCID(&sig->signature[0], PRTE_PROC_MY_NAME->nspace, PMIX_RANK_WILDCARD);
-                if (PRTE_SUCCESS != (rc = prte_grpcomm.xcast(sig, PRTE_RML_TAG_DAEMON, cmd))) {
-                    PRTE_ERROR_LOG(rc);
-                }
-                PMIX_DATA_BUFFER_RELEASE(cmd);
-                PMIX_RELEASE(sig);
-            }
-        } else if (0 == strncmp(directives[m].key, PMIX_JOB_CTRL_SIGNAL, PMIX_MAX_KEYLEN)) {
-            PMIX_DATA_BUFFER_CREATE(cmd);
-            cmmnd = PRTE_DAEMON_SIGNAL_LOCAL_PROCS;
-            /* pack the command */
-            rc = PMIx_Data_pack(NULL, cmd, &cmmnd, 1, PMIX_UINT8);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_ERROR_LOG(rc);
-                PMIX_DATA_BUFFER_RELEASE(cmd);
-                return rc;
-            }
-            /* pack the target jobid */
-            if (NULL == targets) {
-                PMIX_LOAD_NSPACE(jobid, NULL);
-            } else {
-                proct = (pmix_proc_t *) &targets[0];
-                PMIX_LOAD_NSPACE(jobid, proct->nspace);
-            }
-            rc = PMIx_Data_pack(NULL, cmd, &jobid, 1, PMIX_PROC_NSPACE);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_ERROR_LOG(rc);
-                PMIX_DATA_BUFFER_RELEASE(cmd);
-                return rc;
-            }
-            /* pack the signal */
-            PMIX_VALUE_GET_NUMBER(rc, &directives[m].value, signum, int32_t);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_DATA_BUFFER_RELEASE(cmd);
-                return rc;
-            }
-            rc = PMIx_Data_pack(NULL, cmd, &signum, 1, PMIX_INT32);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_ERROR_LOG(rc);
-                PMIX_DATA_BUFFER_RELEASE(cmd);
-                return rc;
-            }
-            /* goes to all daemons */
-            sig = PMIX_NEW(prte_grpcomm_signature_t);
-            sig->signature = (pmix_proc_t *) malloc(sizeof(pmix_proc_t));
-            sig->sz = 1;
-            PMIX_LOAD_PROCID(&sig->signature[0], PRTE_PROC_MY_NAME->nspace, PMIX_RANK_WILDCARD);
-            if (PRTE_SUCCESS != (rc = prte_grpcomm.xcast(sig, PRTE_RML_TAG_DAEMON, cmd))) {
-                PRTE_ERROR_LOG(rc);
-            }
-            PMIX_DATA_BUFFER_RELEASE(cmd);
-            PMIX_RELEASE(sig);
-        }
-    }
-
-    return PMIX_OPERATION_SUCCEEDED;
-}
diff --git a/src/tools/psched/errmgr.c b/src/tools/psched/errmgr.c
deleted file mode 100644
index 88fd3de000..0000000000
--- a/src/tools/psched/errmgr.c
+++ /dev/null
@@ -1,710 +0,0 @@
-/*
- * Copyright (c) 2009-2011 The Trustees of Indiana University.
- *                         All rights reserved.
- * Copyright (c) 2010-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2010-2017 Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2004-2011 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2011      Oracle and/or all its affiliates.  All rights reserved.
- * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
- *                         All rights reserved.
- * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2017      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2024 Nanook Consulting.  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "prte_config.h"
-
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <string.h>
-#ifdef HAVE_SYS_WAIT_H
-#    include <sys/wait.h>
-#endif
-#include "src/pmix/pmix-internal.h"
-#include <pmix.h>
-#include <pmix_server.h>
-
-#include "src/pmix/pmix-internal.h"
-#include "src/util/pmix_output.h"
-#include "src/util/pmix_printf.h"
-
-#include "src/mca/ess/ess.h"
-#include "src/mca/grpcomm/grpcomm.h"
-#include "src/mca/iof/base/base.h"
-#include "src/mca/odls/base/base.h"
-#include "src/mca/plm/base/base.h"
-#include "src/mca/rmaps/rmaps_types.h"
-#include "src/rml/rml.h"
-#include "src/mca/state/state.h"
-
-#include "src/threads/pmix_threads.h"
-#include "src/util/error_strings.h"
-#include "src/util/name_fns.h"
-#include "src/util/proc_info.h"
-#include "src/util/pmix_show_help.h"
-
-#include "src/runtime/prte_globals.h"
-#include "src/runtime/prte_locks.h"
-#include "src/runtime/prte_quit.h"
-
-#include "src/mca/errmgr/base/base.h"
-#include "src/mca/errmgr/base/errmgr_private.h"
-#include "src/mca/errmgr/errmgr.h"
-
-#include "psched.h"
-
-static int init(void);
-static int finalize(void);
-
-/******************
- * dvm module
- ******************/
-prte_errmgr_base_module_t psched_errmgr_module = {
-    .init = init,
-    .finalize = finalize,
-    .logfn = prte_errmgr_base_log
-};
-
-/*
- * Local functions
- */
-static void job_errors(int fd, short args, void *cbdata);
-static void proc_errors(int fd, short args, void *cbdata);
-static void check_send_notification(prte_job_t *jdata,
-                                    prte_proc_t *proc,
-                                    pmix_status_t event);
-
-static int errmgr_base_verbose = -1;
-void psched_errmgr_init(void)
-{
-    pmix_output_stream_t lds;
-
-    pmix_mca_base_var_register("prte", "errmgr", "base", "verbose",
-                               "Verbosity for debugging errmgr framework",
-                               PMIX_MCA_BASE_VAR_TYPE_INT,
-                               &errmgr_base_verbose);
-    if (0 <= errmgr_base_verbose) {
-        PMIX_CONSTRUCT(&lds, pmix_output_stream_t);
-        lds.lds_want_stdout = true;
-        prte_errmgr_base_framework.framework_output = pmix_output_open(&lds);
-        PMIX_DESTRUCT(&lds);
-        pmix_output_set_verbosity(prte_errmgr_base_framework.framework_output, errmgr_base_verbose);
-    }
-    prte_errmgr = psched_errmgr_module;
-    psched_errmgr_module.init();
-}
-
-static int init(void)
-{
-    pmix_output_verbose(2, prte_errmgr_base_framework.framework_output,
-                        "%s errmgr:psched: initialize",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    /* setup state machine to trap job errors */
-    prte_state.add_job_state(PRTE_JOB_STATE_ERROR, job_errors);
-
-    /* set the lost connection state to run at MSG priority so
-     * we can process any last messages from the proc
-     */
-    prte_state.add_proc_state(PRTE_PROC_STATE_COMM_FAILED, proc_errors);
-
-    prte_state.add_proc_state(PRTE_PROC_STATE_ERROR, proc_errors);
-
-    return PRTE_SUCCESS;
-}
-
-static int finalize(void)
-{
-    return PRTE_SUCCESS;
-}
-
-static void _terminate_job(pmix_nspace_t jobid)
-{
-    pmix_pointer_array_t procs;
-    prte_proc_t pobj;
-
-    PMIX_CONSTRUCT(&procs, pmix_pointer_array_t);
-    pmix_pointer_array_init(&procs, 1, 1, 1);
-    PMIX_CONSTRUCT(&pobj, prte_proc_t);
-    PMIX_LOAD_PROCID(&pobj.name, jobid, PMIX_RANK_WILDCARD);
-    pmix_pointer_array_add(&procs, &pobj);
-    prte_plm.terminate_procs(&procs);
-    PMIX_DESTRUCT(&procs);
-    PMIX_DESTRUCT(&pobj);
-}
-
-static void job_errors(int fd, short args, void *cbdata)
-{
-    prte_state_caddy_t *caddy = (prte_state_caddy_t *) cbdata;
-    prte_job_t *jdata;
-    prte_job_state_t jobstate;
-    int32_t rc;
-    PRTE_HIDE_UNUSED_PARAMS(fd, args);
-
-    PMIX_ACQUIRE_OBJECT(caddy);
-
-    /*
-     * if prte is trying to shutdown, just let it
-     */
-    if (prte_finalizing) {
-        return;
-    }
-
-    /* if the jdata is NULL, then it is referencing the daemon job */
-    if (NULL == caddy->jdata) {
-        caddy->jdata = prte_get_job_data_object(PRTE_PROC_MY_NAME->nspace);
-        PMIX_RETAIN(caddy->jdata);
-    }
-
-    /* update the state */
-    jdata = caddy->jdata;
-    jobstate = caddy->job_state;
-    jdata->state = jobstate;
-
-    PMIX_OUTPUT_VERBOSE((1, prte_errmgr_base_framework.framework_output,
-                         "%s errmgr:dvm: job %s reported state %s",
-                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_JOBID_PRINT(jdata->nspace),
-                         prte_job_state_to_str(jobstate)));
-
-    if (PMIX_CHECK_NSPACE(jdata->nspace, PRTE_PROC_MY_NAME->nspace)) {
-        if (PRTE_JOB_STATE_FAILED_TO_START == jdata->state
-            || PRTE_JOB_STATE_NEVER_LAUNCHED == jdata->state
-            || PRTE_JOB_STATE_FAILED_TO_LAUNCH == jdata->state
-            || PRTE_JOB_STATE_CANNOT_LAUNCH == jdata->state) {
-            prte_routing_is_enabled = false;
-            PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_DAEMONS_TERMINATED);
-            PMIX_RELEASE(caddy);
-            return;
-        }
-        /* if the daemon job aborted and we haven't heard from everyone yet,
-         * then this could well have been caused by a daemon not finding
-         * a way back to us. In this case, output a message indicating a daemon
-         * died without reporting. Otherwise, say nothing as we
-         * likely already output an error message */
-        if (PRTE_JOB_STATE_ABORTED == jobstate && jdata->num_procs != jdata->num_reported) {
-            prte_routing_is_enabled = false;
-            pmix_show_help("help-errmgr-base.txt", "failed-daemon", true);
-        }
-        /* there really isn't much else we can do since the problem
-         * is in the DVM itself, so best just to terminate */
-        jdata->num_terminated = jdata->num_procs;
-        /* activate the terminated state so we can exit */
-        PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_TERMINATED);
-        PMIX_RELEASE(caddy);
-        return;
-    }
-
-    /* all other cases involve jobs submitted to the DVM - therefore,
-     * we only inform the submitter of the problem, but do NOT terminate
-     * the DVM itself */
-
-    PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                         "%s errmgr:dvm sending notification of job %s failure to %s",
-                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_JOBID_PRINT(jdata->nspace),
-                         PRTE_NAME_PRINT(&jdata->originator)));
-
-    /* all jobs were spawned by a requestor, so ensure that requestor
-     * has been notified that the spawn completed - otherwise, a quick-failing
-     * job might not generate a spawn response */
-    rc = prte_pmix_convert_job_state_to_error(jobstate);
-    rc = prte_plm_base_spawn_response(rc, jdata);
-    if (PRTE_SUCCESS != rc) {
-        PRTE_ERROR_LOG(rc);
-    }
-
-    /* ensure we terminate any processes left running in the DVM */
-    _terminate_job(jdata->nspace);
-
-    /* if the job never launched, then we need to let the
-     * state machine know this job failed - it has no
-     * other means of being alerted since no proc states
-     * will be triggered */
-    if (PRTE_JOB_STATE_FAILED_TO_START == jdata->state
-        || PRTE_JOB_STATE_NEVER_LAUNCHED == jdata->state
-        || PRTE_JOB_STATE_FAILED_TO_LAUNCH == jdata->state
-        || PRTE_JOB_STATE_ALLOC_FAILED == jdata->state
-        || PRTE_JOB_STATE_MAP_FAILED == jdata->state
-        || PRTE_JOB_STATE_CANNOT_LAUNCH == jdata->state) {
-        PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_TERMINATED);
-    }
-
-    /* cleanup */
-    PMIX_RELEASE(caddy);
-}
-
-static void proc_errors(int fd, short args, void *cbdata)
-{
-    prte_state_caddy_t *caddy = (prte_state_caddy_t *) cbdata;
-    prte_job_t *jdata;
-    prte_proc_t *pptr, *proct;
-    pmix_proc_t *proc = &caddy->name;
-    prte_proc_state_t state = caddy->proc_state;
-    int i;
-    int32_t i32, *i32ptr;
-    bool flag;
-    PRTE_HIDE_UNUSED_PARAMS(fd, args);
-
-    PMIX_ACQUIRE_OBJECT(caddy);
-
-    PMIX_OUTPUT_VERBOSE((1, prte_errmgr_base_framework.framework_output,
-                         "%s errmgr:dvm: for proc %s state %s",
-                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                         PRTE_NAME_PRINT(proc), prte_proc_state_to_str(state)));
-
-    /* get the job object */
-    if (prte_finalizing || NULL == (jdata = prte_get_job_data_object(proc->nspace))) {
-        /* could be a race condition */
-        PMIX_RELEASE(caddy);
-        return;
-    }
-    pptr = (prte_proc_t *) pmix_pointer_array_get_item(jdata->procs, proc->rank);
-    if (NULL == pptr) {
-        PRTE_ERROR_LOG(PRTE_ERR_NOT_FOUND);
-        goto cleanup;
-    }
-
-    if (PMIX_CHECK_NSPACE(jdata->nspace, PRTE_PROC_MY_NAME->nspace)) {
-        /* NOTE: this is a daemon process that had the error */
-        /* we MUST handle a communication failure with special care to
-         * avoid normal termination issues */
-        if (PRTE_PROC_STATE_COMM_FAILED == state ||
-            PRTE_PROC_STATE_HEARTBEAT_FAILED == state ||
-            PRTE_PROC_STATE_UNABLE_TO_SEND_MSG == state ||
-            PRTE_PROC_STATE_FAILED_TO_START == state) {
-            /* if this is my own connection, ignore it */
-            if (PRTE_PROC_MY_NAME->rank == proc->rank) {
-                PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                                     "%s Comm failure on my own connection - ignoring it",
-                                     PRTE_NAME_PRINT(PRTE_PROC_MY_NAME)));
-                goto cleanup;
-            }
-            /* mark the daemon as gone */
-            PRTE_FLAG_UNSET(pptr, PRTE_PROC_FLAG_ALIVE);
-            /* update the state */
-            pptr->state = state;
-            /* adjust our num_procs */
-            --prte_process_info.num_daemons;
-            /* if we have ordered prteds to terminate or abort
-             * is in progress, record it */
-            if (prte_prteds_term_ordered || prte_abnormal_term_ordered) {
-                PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                                     "%s Comm failure: daemons terminating - recording daemon %s as gone",
-                                     PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc)));
-                /* remove from dependent routes, if it is one */
-                prte_rml_route_lost(proc->rank);
-                /* if all my routes and local children are gone, then terminate ourselves */
-                if (0 == pmix_list_get_size(&prte_rml_base.children)) {
-                    for (i = 0; i < prte_local_children->size; i++) {
-                        proct = (prte_proc_t *) pmix_pointer_array_get_item(prte_local_children, i);
-                        if (NULL != proct &&
-                            PRTE_FLAG_TEST(pptr, PRTE_PROC_FLAG_ALIVE) &&
-                            proct->state < PRTE_PROC_STATE_UNTERMINATED) {
-                            /* at least one is still alive */
-                            PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                                                 "%s Comm failure: at least one proc (%s) still alive",
-                                                 PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                                                 PRTE_NAME_PRINT(&proct->name)));
-                            goto cleanup;
-                        }
-                    }
-                    /* call our appropriate exit procedure */
-                    PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                                         "%s errmgr_dvm: all routes and children gone - ordering exit",
-                                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME)));
-                    PRTE_ACTIVATE_JOB_STATE(NULL, PRTE_JOB_STATE_DAEMONS_TERMINATED);
-                } else {
-                    PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                                         "%s Comm failure: %d routes remain alive",
-                                         PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                                         (int) pmix_list_get_size(&prte_rml_base.children)));
-                }
-                goto cleanup;
-            }
-            PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                                 "%s Comm failure: daemon %s - aborting",
-                                 PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc)));
-            /* record the first one to fail */
-            if (!PRTE_FLAG_TEST(jdata, PRTE_JOB_FLAG_ABORTED)) {
-                /* output an error message so the user knows what happened */
-                pmix_show_help("help-errmgr-base.txt", "node-died", true,
-                               PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), prte_process_info.nodename,
-                               PRTE_NAME_PRINT(proc), pptr->node->name);
-                /* mark the daemon job as failed */
-                jdata->state = PRTE_JOB_STATE_COMM_FAILED;
-                /* point to the lowest rank to cause the problem */
-                prte_set_attribute(&jdata->attributes, PRTE_JOB_ABORTED_PROC, PRTE_ATTR_LOCAL, pptr,
-                                   PMIX_POINTER);
-                /* retain the object so it doesn't get free'd */
-                PMIX_RETAIN(pptr);
-                PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_ABORTED);
-                /* update our exit code */
-                jdata->exit_code = pptr->exit_code;
-                /* just in case the exit code hadn't been set, do it here - this
-                 * won't override any reported exit code */
-                if (0 == jdata->exit_code) {
-                    jdata->exit_code = PRTE_ERR_COMM_FAILURE;
-                }
-            }
-        } else {
-            pmix_output(0, "UNSUPPORTED DAEMON ERROR STATE: %s", prte_proc_state_to_str(state));
-        }
-        /* since communications have failed, we have to simply force ourselves
-         * to terminate as we cannot rely on the routing tree to get messages
-         * out to other daemons */
-        prte_abnormal_term_ordered = true;
-        PRTE_ACTIVATE_JOB_STATE(NULL, PRTE_JOB_STATE_DAEMONS_TERMINATED);
-        goto cleanup;
-    }
-
-    /* update the proc state - can get multiple reports on a proc
-     * depending on circumstances, so ensure we only do this once
-     */
-    if (pptr->state < PRTE_PROC_STATE_TERMINATED) {
-        pptr->state = state;
-    }
-
-    /* if we were ordered to terminate, mark this proc as dead and see if
-     * any of our routes or local children remain alive - if not, then
-     * terminate ourselves. */
-    if (prte_prteds_term_ordered) {
-        for (i = 0; i < prte_local_children->size; i++) {
-            proct = (prte_proc_t*)pmix_pointer_array_get_item(prte_local_children, i);
-            if (NULL != proct) {
-                if (PRTE_FLAG_TEST(proct, PRTE_PROC_FLAG_ALIVE)) {
-                    goto keep_going;
-                }
-            }
-        }
-        /* if all my routes and children are gone, then terminate
-           ourselves nicely (i.e., this is a normal termination) */
-        if (0 == pmix_list_get_size(&prte_rml_base.children)) {
-            PMIX_OUTPUT_VERBOSE((2, prte_errmgr_base_framework.framework_output,
-                                 "%s errmgr:default:dvm all routes gone - exiting",
-                                 PRTE_NAME_PRINT(PRTE_PROC_MY_NAME)));
-            PRTE_ACTIVATE_JOB_STATE(NULL, PRTE_JOB_STATE_DAEMONS_TERMINATED);
-        }
-    }
-
-keep_going:
-    /* always mark the waitpid as having fired */
-    PRTE_ACTIVATE_PROC_STATE(&pptr->name, PRTE_PROC_STATE_WAITPID_FIRED);
-    /* if this is a remote proc, we won't hear anything more about it
-     * as the default behavior would be to terminate the job. So be sure to
-     * mark the IOF as having completed too so we correctly mark this proc
-     * as dead and notify everyone as required */
-    if (!PRTE_FLAG_TEST(pptr, PRTE_PROC_FLAG_LOCAL)) {
-        PRTE_ACTIVATE_PROC_STATE(&pptr->name, PRTE_PROC_STATE_IOF_COMPLETE);
-    }
-
-    /* simplify later checks */
-    flag = (prte_get_attribute(&jdata->attributes, PRTE_JOB_RECOVERABLE, NULL, PMIX_BOOL) ||
-            prte_get_attribute(&jdata->attributes, PRTE_JOB_CONTINUOUS, NULL, PMIX_BOOL));
-
-    /* ensure we record the failed proc properly so we can report
-     * the error once we terminate
-     */
-    switch (state) {
-    case PRTE_PROC_STATE_KILLED_BY_CMD:
-        PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                             "%s errmgr:dvm: proc %s killed by cmd",
-                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc)));
-        /* we ordered this proc to die, so it isn't an abnormal termination
-         * and we don't flag it as such
-         */
-        if (jdata->num_terminated >= jdata->num_procs) {
-            /* this job has terminated */
-            PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_TERMINATED);
-        } else if (flag) {
-            /* at least one proc survives - send out a notification if one is requested */
-            check_send_notification(jdata, pptr, PMIX_ERR_PROC_KILLED_BY_CMD);
-        }
-        break;
-
-    case PRTE_PROC_STATE_ABORTED_BY_SIG:
-        PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                             "%s errmgr:dvm: proc %s aborted by signal",
-                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc)));
-        if (flag) {
-            /* send out a notification if one is requested */
-            check_send_notification(jdata, pptr, PMIX_ERR_PROC_ABORTED_BY_SIG);
-        } else {
-            if (!PRTE_FLAG_TEST(jdata, PRTE_JOB_FLAG_ABORTED)) {
-                jdata->state = PRTE_JOB_STATE_ABORTED_BY_SIG;
-                /* point to the first rank to cause the problem */
-                prte_set_attribute(&jdata->attributes, PRTE_JOB_ABORTED_PROC, PRTE_ATTR_LOCAL, pptr,
-                                   PMIX_POINTER);
-                /* retain the object so it doesn't get free'd */
-                PMIX_RETAIN(pptr);
-                PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_ABORTED);
-                jdata->exit_code = pptr->exit_code;
-                _terminate_job(jdata->nspace);
-            }
-        }
-        break;
-
-    case PRTE_PROC_STATE_TERM_WO_SYNC:
-        PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                             "%s errmgr:dvm: proc %s terminated without sync",
-                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc)));
-        if (flag) {
-            /* send out a notification if one is requested */
-            check_send_notification(jdata, pptr, PMIX_ERR_PROC_TERM_WO_SYNC);
-        } else {
-            if (!PRTE_FLAG_TEST(jdata, PRTE_JOB_FLAG_ABORTED)) {
-                jdata->state = PRTE_JOB_STATE_ABORTED_WO_SYNC;
-                /* point to the first rank to cause the problem */
-                prte_set_attribute(&jdata->attributes, PRTE_JOB_ABORTED_PROC, PRTE_ATTR_LOCAL, pptr,
-                                   PMIX_POINTER);
-                /* retain the object so it doesn't get free'd */
-                PMIX_RETAIN(pptr);
-                PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_ABORTED);
-                jdata->exit_code = pptr->exit_code;
-                /* send out a notification is one is requested */
-                check_send_notification(jdata, pptr, PMIX_ERR_PROC_TERM_WO_SYNC);
-                /* now treat a special case - if the proc exit'd without a required
-                 * sync, it may have done so with a zero exit code. We want to ensure
-                 * that the user realizes there was an error, so in this -one- case,
-                 * we overwrite the process' exit code with the default error code
-                 */
-                if (0 == jdata->exit_code) {
-                    jdata->exit_code = PRTE_ERROR_DEFAULT_EXIT_CODE;
-                }
-                /* kill the job */
-                _terminate_job(jdata->nspace);
-            }
-        }
-        break;
-
-    case PRTE_PROC_STATE_FAILED_TO_START:
-    case PRTE_PROC_STATE_FAILED_TO_LAUNCH:
-        PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                             "%s errmgr:dvm: proc %s %s", PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                             PRTE_NAME_PRINT(proc), prte_proc_state_to_str(state)));
-        if (!PRTE_FLAG_TEST(jdata, PRTE_JOB_FLAG_ABORTED)) {
-            if (PRTE_PROC_STATE_FAILED_TO_START) {
-                jdata->state = PRTE_JOB_STATE_FAILED_TO_START;
-            } else {
-                jdata->state = PRTE_JOB_STATE_FAILED_TO_LAUNCH;
-            }
-            /* point to the first rank to cause the problem */
-            prte_set_attribute(&jdata->attributes, PRTE_JOB_ABORTED_PROC, PRTE_ATTR_LOCAL, pptr,
-                               PMIX_POINTER);
-            /* update our exit code */
-            jdata->exit_code = pptr->exit_code;
-            /* just in case the exit code hadn't been set, do it here - this
-             * won't override any reported exit code */
-            if (0 == jdata->exit_code) {
-                jdata->exit_code = PRTE_ERR_FAILED_TO_START;
-            }
-            /* retain the object so it doesn't get free'd */
-            PMIX_RETAIN(pptr);
-            PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_ABORTED);
-            /* kill the job */
-            _terminate_job(jdata->nspace);
-        }
-        /* if this was a daemon, report it */
-        if (PMIX_CHECK_NSPACE(jdata->nspace, PRTE_PROC_MY_NAME->nspace)) {
-            /* output a message indicating we failed to launch a daemon */
-            pmix_show_help("help-errmgr-base.txt", "failed-daemon-launch",
-                           true, prte_tool_basename);
-        }
-        PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_FAILED_TO_START);
-        break;
-
-    case PRTE_PROC_STATE_CALLED_ABORT:
-        PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                             "%s errmgr:dvm: proc %s called abort with exit code %d",
-                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc),
-                             pptr->exit_code));
-        /* this proc ordered the job to abort */
-        if (flag) {
-            /* send out a notification if one is requested */
-            check_send_notification(jdata, pptr, PMIX_ERR_PROC_REQUESTED_ABORT);
-        } else {
-            if (!PRTE_FLAG_TEST(jdata, PRTE_JOB_FLAG_ABORTED)) {
-                jdata->state = PRTE_JOB_STATE_CALLED_ABORT;
-                /* point to the first proc to cause the problem */
-                prte_set_attribute(&jdata->attributes, PRTE_JOB_ABORTED_PROC, PRTE_ATTR_LOCAL, pptr,
-                                   PMIX_POINTER);
-                /* retain the object so it doesn't get free'd */
-                PMIX_RETAIN(pptr);
-                PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_ABORTED);
-                jdata->exit_code = pptr->exit_code;
-                /* kill the job */
-                _terminate_job(jdata->nspace);
-            }
-        }
-        break;
-
-    case PRTE_PROC_STATE_TERM_NON_ZERO:
-        PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                             "%s errmgr:dvm: proc %s exited with non-zero status %d",
-                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc),
-                             pptr->exit_code));
-        jdata->exit_code = pptr->exit_code;
-        PRTE_FLAG_UNSET(pptr, PRTE_PROC_FLAG_ALIVE);
-        jdata->num_terminated++;
-        /* track the number of non-zero exits */
-        i32 = 0;
-        i32ptr = &i32;
-        prte_get_attribute(&jdata->attributes, PRTE_JOB_NUM_NONZERO_EXIT, (void **) &i32ptr,
-                           PMIX_INT32);
-        ++i32;
-        prte_set_attribute(&jdata->attributes, PRTE_JOB_NUM_NONZERO_EXIT, PRTE_ATTR_LOCAL, i32ptr,
-                           PMIX_INT32);
-        if (jdata->num_terminated >= jdata->num_procs) {
-            /* this job has terminated */
-            PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_TERMINATED);
-        } else if (flag && prte_get_attribute(&jdata->attributes, PRTE_JOB_ERROR_NONZERO_EXIT, NULL, PMIX_BOOL)) {
-            check_send_notification(jdata, pptr, PMIX_ERR_EXIT_NONZERO_TERM);
-        } else {
-            if (!PRTE_FLAG_TEST(jdata, PRTE_JOB_FLAG_ABORTED)) {
-                jdata->state = PRTE_JOB_STATE_NON_ZERO_TERM;
-                /* point to the first rank to cause the problem */
-                prte_set_attribute(&jdata->attributes, PRTE_JOB_ABORTED_PROC,
-                                   PRTE_ATTR_LOCAL, pptr, PMIX_POINTER);
-                /* retain the object so it doesn't get free'd */
-                PMIX_RETAIN(pptr);
-                PRTE_FLAG_SET(jdata, PRTE_JOB_FLAG_ABORTED);
-                /* kill the job */
-                _terminate_job(jdata->nspace);
-            }
-        }
-        break;
-
-    default:
-        /* shouldn't get this, but terminate job if required */
-        PMIX_OUTPUT_VERBOSE((5, prte_errmgr_base_framework.framework_output,
-                             "%s errmgr:dvm: proc %s default error %s",
-                             PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(proc),
-                             prte_proc_state_to_str(state)));
-        if (jdata->num_terminated == jdata->num_procs) {
-            PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_TERMINATED);
-        }
-        break;
-    }
-
-cleanup:
-    PMIX_RELEASE(caddy);
-}
-
-static void check_send_notification(prte_job_t *jdata,
-                                    prte_proc_t *proc,
-                                    pmix_status_t event)
-{
-    prte_grpcomm_signature_t sig;
-    int rc;
-    pmix_info_t *info;
-    size_t ninfo;
-    pmix_proc_t target;
-    pmix_data_buffer_t pbkt;
-    pmix_data_range_t range = PMIX_RANGE_CUSTOM;
-
-    pmix_output_verbose(5, prte_state_base_framework.framework_output,
-                        "%s errmgr:dvm:sending notification %s affected proc %s",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                        PMIx_Error_string(event),
-                        PRTE_NAME_PRINT(&proc->name));
-
-    if (!prte_get_attribute(&jdata->attributes, PRTE_JOB_NOTIFY_ERRORS, NULL, PMIX_BOOL) ||
-        prte_dvm_abort_ordered) {
-        return;
-    }
-    /* we checked for termination due to the specific error we encountered, but
-     * it is possible that we received another type of error that wouldn't have
-     * resulted in terminating the job. Thus, we still check to see if the job
-     * is being aborted before sending anything out */
-    if (PRTE_FLAG_TEST(jdata, PRTE_JOB_FLAG_ABORTED)) {
-        /* this job has already been aborted, so we don't need to notify
-         * about the fate of any proc within it */
-        return;
-    }
-    /* notify the other procs of the termination */
-    PMIX_LOAD_PROCID(&target, jdata->nspace, PMIX_RANK_WILDCARD);
-
-    /* pack the info for sending */
-    PMIX_DATA_BUFFER_CONSTRUCT(&pbkt);
-
-    /* we need to add a flag indicating this came from an invalid proc so that we will
-     * inject it into our own PMIx server library */
-    rc = PMIx_Data_pack(NULL, &pbkt, &PRTE_NAME_INVALID->rank, 1, PMIX_PROC_RANK);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return;
-    }
-    /* pack the status code */
-    rc = PMIx_Data_pack(NULL, &pbkt, &event, 1, PMIX_STATUS);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return;
-    }
-    /* pack the source - it cannot be me as that will cause
-     * the pmix server to upcall the event back to me */
-    rc = PMIx_Data_pack(NULL, &pbkt, &proc->name, 1, PMIX_PROC);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return;
-    }
-    /* pack the range */
-    rc = PMIx_Data_pack(NULL, &pbkt, &range, 1, PMIX_DATA_RANGE);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return;
-    }
-
-    /* setup the info */
-    if (-1 != proc->exit_code) {
-        ninfo = 3;
-    } else {
-        ninfo = 2;
-    }
-    PMIX_INFO_CREATE(info, ninfo);
-    PMIX_INFO_LOAD(&info[0], PMIX_EVENT_AFFECTED_PROC, &proc->name, PMIX_PROC);
-    PMIX_INFO_LOAD(&info[1], PMIX_EVENT_CUSTOM_RANGE, &target, PMIX_PROC);
-    if (-1 != proc->exit_code) {
-        PMIX_INFO_LOAD(&info[2], PMIX_EXIT_CODE, &proc->exit_code, PMIX_INT);
-    }
-
-    /* pack the number of infos */
-    rc = PMIx_Data_pack(NULL, &pbkt, &ninfo, 1, PMIX_SIZE);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        PMIX_INFO_FREE(info, ninfo);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return;
-    }
-    /* pack the infos themselves */
-    rc = PMIx_Data_pack(NULL, &pbkt, info, ninfo, PMIX_INFO);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        PMIX_INFO_FREE(info, ninfo);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return;
-    }
-    PMIX_INFO_FREE(info, ninfo);
-
-    /* xcast it to everyone */
-    PMIX_CONSTRUCT(&sig, prte_grpcomm_signature_t);
-    sig.signature = (pmix_proc_t *) malloc(sizeof(pmix_proc_t));
-    PMIX_LOAD_PROCID(&sig.signature[0], PRTE_PROC_MY_NAME->nspace, PMIX_RANK_WILDCARD);
-    sig.sz = 1;
-
-    if (PRTE_SUCCESS != (rc = prte_grpcomm.xcast(&sig, PRTE_RML_TAG_NOTIFICATION, &pbkt))) {
-        PRTE_ERROR_LOG(rc);
-    }
-    PMIX_DESTRUCT(&sig);
-    PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-}
diff --git a/src/tools/psched/event.c b/src/tools/psched/event.c
deleted file mode 100644
index 36e7fa0b60..0000000000
--- a/src/tools/psched/event.c
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2011 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-2013 Los Alamos National Security, LLC.
- *                         All rights reserved.
- * Copyright (c) 2009-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2017 Mellanox Technologies, Inc.
- *                         All rights reserved.
- * Copyright (c) 2014-2019 Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2020      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- *
- */
-
-#include "prte_config.h"
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-
-#include "src/hwloc/hwloc-internal.h"
-#include "src/pmix/pmix-internal.h"
-#include "src/util/pmix_argv.h"
-#include "src/util/pmix_output.h"
-
-#include "src/mca/errmgr/errmgr.h"
-#include "src/mca/grpcomm/base/base.h"
-#include "src/mca/iof/base/base.h"
-#include "src/mca/iof/iof.h"
-#include "src/mca/plm/base/plm_private.h"
-#include "src/mca/plm/plm.h"
-#include "src/mca/plm/base/plm_private.h"
-#include "src/mca/rmaps/rmaps_types.h"
-#include "src/rml/rml.h"
-#include "src/mca/schizo/schizo.h"
-#include "src/mca/state/state.h"
-#include "src/runtime/prte_globals.h"
-#include "src/runtime/prte_locks.h"
-#include "src/threads/pmix_threads.h"
-#include "src/util/name_fns.h"
-#include "src/util/pmix_show_help.h"
-
-#include "src/prted/pmix/pmix_server_internal.h"
-#include "src/tools/psched/psched.h"
-
-static void _register_events(int sd, short args, void *cbdata)
-{
-    prte_pmix_server_op_caddy_t *cd = (prte_pmix_server_op_caddy_t *) cbdata;
-    PRTE_HIDE_UNUSED_PARAMS(sd, args);
-
-    PMIX_ACQUIRE_OBJECT(cd);
-
-    /* need to implement this */
-
-    if (NULL != cd->cbfunc) {
-        cd->cbfunc(PRTE_SUCCESS, cd->cbdata);
-    }
-    PMIX_RELEASE(cd);
-}
-
-/* hook for the local PMIX server to pass event registrations
- * up to us - we will assume the responsibility for providing
- * notifications for registered events */
-pmix_status_t psched_register_events_fn(pmix_status_t *codes, size_t ncodes,
-                                        const pmix_info_t info[], size_t ninfo,
-                                        pmix_op_cbfunc_t cbfunc, void *cbdata)
-{
-    prte_pmix_server_op_caddy_t *cd;
-
-    /* need to thread-shift this request as we are going
-     * to access our global list of registered events */
-    cd = PMIX_NEW(prte_pmix_server_op_caddy_t);
-    cd->codes = codes;
-    cd->ncodes = ncodes;
-    cd->info = (pmix_info_t *) info;
-    cd->ninfo = ninfo;
-    cd->cbfunc = cbfunc;
-    cd->cbdata = cbdata;
-    prte_event_set(prte_event_base, &(cd->ev), -1, PRTE_EV_WRITE, _register_events, cd);
-    PMIX_POST_OBJECT(cd);
-    prte_event_active(&(cd->ev), PRTE_EV_WRITE, 1);
-    return PMIX_SUCCESS;
-}
-
-static void _deregister_events(int sd, short args, void *cbdata)
-{
-    prte_pmix_server_op_caddy_t *cd = (prte_pmix_server_op_caddy_t *) cbdata;
-    PRTE_HIDE_UNUSED_PARAMS(sd, args);
-
-    PMIX_ACQUIRE_OBJECT(cd);
-
-    /* need to implement this */
-    if (NULL != cd->cbfunc) {
-        cd->cbfunc(PRTE_SUCCESS, cd->cbdata);
-    }
-    PMIX_RELEASE(cd);
-}
-/* hook for the local PMIX server to pass event deregistrations
- * up to us */
-pmix_status_t psched_deregister_events_fn(pmix_status_t *codes, size_t ncodes,
-                                          pmix_op_cbfunc_t cbfunc, void *cbdata)
-{
-    prte_pmix_server_op_caddy_t *cd;
-
-    /* need to thread-shift this request as we are going
-     * to access our global list of registered events */
-    cd = PMIX_NEW(prte_pmix_server_op_caddy_t);
-    cd->codes = codes;
-    cd->ncodes = ncodes;
-    cd->cbfunc = cbfunc;
-    cd->cbdata = cbdata;
-    prte_event_set(prte_event_base, &(cd->ev), -1, PRTE_EV_WRITE, _deregister_events, cd);
-    PMIX_POST_OBJECT(cd);
-    prte_event_active(&(cd->ev), PRTE_EV_WRITE, 1);
-    return PRTE_SUCCESS;
-}
-
-pmix_status_t psched_notify_event(pmix_status_t code, const pmix_proc_t *source,
-                                  pmix_data_range_t range, pmix_info_t info[], size_t ninfo,
-                                  pmix_op_cbfunc_t cbfunc, void *cbdata)
-{
-    int rc;
-    prte_grpcomm_signature_t *sig;
-    pmix_data_buffer_t pbkt;
-    pmix_status_t ret;
-    size_t n;
-    PRTE_HIDE_UNUSED_PARAMS(cbfunc, cbdata);
-
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
-                        "%s local process %s generated event code %s range %s",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), PRTE_NAME_PRINT(source),
-                        PMIx_Error_string(code), PMIx_Data_range_string(range));
-
-    /* we can get events prior to completing prte_init as we have
-     * to init PMIx early so that PRRTE components can use it */
-    PMIX_ACQUIRE_THREAD(&prte_init_lock);
-    if (!prte_initialized) {
-        PMIX_RELEASE_THREAD(&prte_init_lock);
-        goto done;
-    }
-    PMIX_RELEASE_THREAD(&prte_init_lock);
-
-    /* check to see if this is one we sent down */
-    for (n = 0; n < ninfo; n++) {
-        if (0 == strcmp(info[n].key, "prte.notify.donotloop")) {
-            /* yep - do not process */
-            goto done;
-        }
-    }
-
-    /* if this is notification of procs being ready for debug, then
-     * we treat this as a state change */
-    if (PMIX_READY_FOR_DEBUG == code) {
-        PRTE_ACTIVATE_PROC_STATE((pmix_proc_t*)source, PRTE_PROC_STATE_READY_FOR_DEBUG);
-        goto done;
-    }
-
-    /* a local process has generated an event - we need to xcast it
-     * to all the daemons so it can be passed down to their local
-     * procs */
-    PMIX_DATA_BUFFER_CONSTRUCT(&pbkt);
-
-    /* we need to add a flag indicating this came from us as we are going to get it echoed
-     * back to us by the broadcast */
-    if (PMIX_SUCCESS
-        != (rc = PMIx_Data_pack(NULL, &pbkt, &PRTE_PROC_MY_NAME->rank, 1, PMIX_PROC_RANK))) {
-        PMIX_ERROR_LOG(rc);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return rc;
-    }
-
-    /* pack the status code */
-    if (PMIX_SUCCESS != (ret = PMIx_Data_pack(NULL, &pbkt, &code, 1, PMIX_STATUS))) {
-        PMIX_ERROR_LOG(ret);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return ret;
-    }
-    /* pack the source */
-    if (PMIX_SUCCESS != (ret = PMIx_Data_pack(NULL, &pbkt, (pmix_proc_t *) source, 1, PMIX_PROC))) {
-        PMIX_ERROR_LOG(ret);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return ret;
-    }
-    /* pack the range */
-    if (PMIX_SUCCESS != (ret = PMIx_Data_pack(NULL, &pbkt, &range, 1, PMIX_DATA_RANGE))) {
-        PMIX_ERROR_LOG(ret);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return ret;
-    }
-    /* pack the number of infos */
-    if (PMIX_SUCCESS != (ret = PMIx_Data_pack(NULL, &pbkt, &ninfo, 1, PMIX_SIZE))) {
-        PMIX_ERROR_LOG(ret);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return ret;
-    }
-    if (0 < ninfo) {
-        if (PMIX_SUCCESS != (ret = PMIx_Data_pack(NULL, &pbkt, info, ninfo, PMIX_INFO))) {
-            PMIX_ERROR_LOG(ret);
-            PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-            return ret;
-        }
-    }
-
-    /* goes to all daemons */
-    sig = PMIX_NEW(prte_grpcomm_signature_t);
-    if (NULL == sig) {
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        return PMIX_ERR_NOMEM;
-    }
-    sig->signature = (pmix_proc_t *) malloc(sizeof(pmix_proc_t));
-    if (NULL == sig->signature) {
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        PMIX_RELEASE(sig);
-        return PMIX_ERR_NOMEM;
-    }
-    PMIX_LOAD_PROCID(&sig->signature[0], PRTE_PROC_MY_NAME->nspace, PMIX_RANK_WILDCARD);
-    sig->sz = 1;
-    if (PRTE_SUCCESS != (rc = prte_grpcomm.xcast(sig, PRTE_RML_TAG_NOTIFICATION, &pbkt))) {
-        PRTE_ERROR_LOG(rc);
-        PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-        PMIX_RELEASE(sig);
-        return PMIX_ERROR;
-    }
-    PMIX_DATA_BUFFER_DESTRUCT(&pbkt);
-    /* maintain accounting */
-    PMIX_RELEASE(sig);
-
-done:
-    /* we do not need to execute a callback as we did this atomically */
-    return PMIX_OPERATION_SUCCEEDED;
-}
diff --git a/src/tools/psched/psched.c b/src/tools/psched/psched.c
deleted file mode 100644
index f8b18c3371..0000000000
--- a/src/tools/psched/psched.c
+++ /dev/null
@@ -1,768 +0,0 @@
-/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
-/*
- * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2011 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) 2007-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2007-2016 Los Alamos National Security, LLC.  All rights
- *                         reserved.
- * Copyright (c) 2009      Institut National de Recherche en Informatique
- *                         et Automatique. All rights reserved.
- * Copyright (c) 2010      Oracle and/or its affiliates.  All rights reserved.
- * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015-2019 Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2024 Nanook Consulting.  All rights reserved.
- * Copyright (c) 2022      Triad National Security, LLC. All rights
- *                         reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "prte_config.h"
-#include "constants.h"
-
-#include <string.h>
-
-#include <ctype.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#ifdef HAVE_NETDB_H
-#    include <netdb.h>
-#endif
-#ifdef HAVE_SYS_PARAM_H
-#    include <sys/param.h>
-#endif
-#include <errno.h>
-#include <fcntl.h>
-#include <signal.h>
-#ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#endif /* HAVE_SYS_TIME_H */
-#ifdef HAVE_SYS_STAT_H
-#    include <sys/stat.h>
-#endif
-#ifdef HAVE_SYS_WAIT_H
-#    include <sys/wait.h>
-#endif
-
-#include <pmix_server.h>
-
-#include "src/mca/base/pmix_base.h"
-#include "src/mca/base/pmix_mca_base_var.h"
-#include "src/pmix/pmix-internal.h"
-#include "src/runtime/pmix_init_util.h"
-#include "src/util/pmix_argv.h"
-#include "src/util/pmix_basename.h"
-#include "src/util/prte_cmd_line.h"
-#include "src/util/pmix_fd.h"
-#include "src/util/daemon_init.h"
-#include "src/util/malloc.h"
-#include "src/util/pmix_if.h"
-#include "src/util/pmix_os_dirpath.h"
-#include "src/util/pmix_os_path.h"
-#include "src/util/pmix_output.h"
-#include "src/util/pmix_printf.h"
-#include "src/util/pmix_environ.h"
-
-#include "src/util/name_fns.h"
-#include "src/util/pmix_parse_options.h"
-#include "src/util/proc_info.h"
-#include "src/util/pmix_show_help.h"
-#include "src/util/session_dir.h"
-
-#include "src/mca/ess/base/base.h"
-#include "src/mca/plm/base/plm_private.h"
-#include "src/mca/prtebacktrace/base/base.h"
-#include "src/mca/prteinstalldirs/base/base.h"
-#include "src/mca/ras/base/base.h"
-#include "src/mca/schizo/base/base.h"
-#include "src/mca/state/base/base.h"
-
-#include "src/prted/pmix/pmix_server_internal.h"
-#include "src/runtime/prte_globals.h"
-#include "src/runtime/prte_locks.h"
-#include "src/runtime/runtime.h"
-#include "src/runtime/runtime_internals.h"
-
-#include "psched.h"
-
-/*
- * Globals
- */
-static pmix_cli_result_t results;
-
-typedef struct {
-    prte_pmix_lock_t lock;
-    pmix_status_t status;
-    pmix_info_t *info;
-    size_t ninfo;
-} myxfer_t;
-
-static bool forcibly_die = false;
-static int wait_pipe[2];
-static prte_event_t term_handler;
-static int term_pipe[2];
-static pmix_mutex_t abort_inprogress_lock = PMIX_MUTEX_STATIC_INIT;
-static void clean_abort(int fd, short flags, void *arg);
-static void abort_signal_callback(int signal);
-
-static void parent_died_fn(size_t evhdlr_registration_id, pmix_status_t status,
-                           const pmix_proc_t *source, pmix_info_t info[], size_t ninfo,
-                           pmix_info_t res[], size_t nres,
-                           pmix_event_notification_cbfunc_fn_t cbfunc, void *cbdata)
-{
-    PRTE_HIDE_UNUSED_PARAMS(evhdlr_registration_id, status, source, info, ninfo, res, nres);
-    clean_abort(0, 0, NULL);
-    cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
-}
-
-static void evhandler_reg_callbk(pmix_status_t status, size_t evhandler_ref, void *cbdata)
-{
-    myxfer_t *lock = (myxfer_t *) cbdata;
-    PRTE_HIDE_UNUSED_PARAMS(evhandler_ref);
-
-    lock->status = status;
-    PRTE_PMIX_WAKEUP_THREAD(&lock->lock);
-}
-
-static int wait_dvm(pid_t pid)
-{
-    char reply;
-    int rc;
-    int status;
-
-    close(wait_pipe[1]);
-    do {
-        rc = read(wait_pipe[0], &reply, 1);
-    } while (0 > rc && EINTR == errno);
-
-    if (1 == rc && 'K' == reply) {
-        return 0;
-    } else if (0 == rc) {
-        waitpid(pid, &status, 0);
-        if (WIFEXITED(status)) {
-            return WEXITSTATUS(status);
-        }
-    }
-    return 255;
-}
-
-static bool check_exist(char *path)
-{
-    struct stat buf;
-    /* coverity[TOCTOU] */
-    if (0 == stat(path, &buf)) { /* exists */
-        return true;
-    }
-    return false;
-}
-
-int main(int argc, char *argv[])
-{
-    int ret = 0;
-    int code;
-    pmix_proc_t pname;
-    pmix_status_t prc;
-    myxfer_t xfer;
-    char *mypidfile = NULL;
-    pmix_info_t info;
-    char **pargv;
-    int pargc;
-    prte_schizo_base_module_t *schizo;
-    pmix_cli_item_t *opt;
-    char *path = NULL;
-    prte_job_t *jdata;
-    prte_app_context_t *app;
-    prte_node_t *node;
-    prte_proc_t *pptr;
-    prte_topology_t *t;
-
-    /* initialize the globals */
-    prte_tool_basename = pmix_basename(argv[0]);
-    prte_tool_actual = "psched";
-    pargc = argc;
-    pargv = pmix_argv_copy_strip(argv);  // strip any quoted arguments
-
-    /* carry across the toolname */
-    pmix_tool_basename = prte_tool_basename;
-
-    /* initialize install dirs code */
-    ret = pmix_mca_base_framework_open(&prte_prteinstalldirs_base_framework,
-                                       PMIX_MCA_BASE_OPEN_DEFAULT);
-    if (PRTE_SUCCESS != ret) {
-        fprintf(stderr,
-                "prte_prteinstalldirs_base_open() failed -- process will likely abort (%s:%d, "
-                "returned %d instead of PRTE_SUCCESS)\n",
-                __FILE__, __LINE__, ret);
-        return ret;
-    }
-
-    /* initialize the MCA infrastructure */
-    if (check_exist(prte_install_dirs.prtelibdir)) {
-        pmix_asprintf(&path, "prte@%s", prte_install_dirs.prtelibdir);
-    }
-    ret = pmix_init_util(NULL, 0, path);
-    if (NULL != path) {
-        free(path);
-    }
-    if (PMIX_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "pmix_init_util", PRTE_ERROR_NAME(ret), ret);
-        return prte_pmix_convert_status(ret);
-    }
-    ret = pmix_show_help_add_dir(prte_install_dirs.prtedatadir);
-    if (PMIX_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "show_help_add_dir", PRTE_ERROR_NAME(ret), ret);
-        return prte_pmix_convert_status(ret);
-    }
-
-    /* ensure we know the type of proc for when we finalize */
-    prte_process_info.proc_type = PRTE_PROC_MASTER;
-
-    /* we always need the prrte and pmix params */
-    ret = prte_schizo_base_parse_prte(pargc, 0, pargv, NULL);
-    if (PRTE_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "parse_prte params", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    ret = prte_schizo_base_parse_pmix(pargc, 0, pargv, NULL);
-    if (PRTE_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "parse_pmix params", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* initialize the memory allocator */
-    prte_malloc_init();
-
-    /* initialize the output system */
-    pmix_output_init();
-
-    /* Setup the parameter system */
-    if (PRTE_SUCCESS != (ret = pmix_mca_base_var_init())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "var_init", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* set the nodename so anyone who needs it has it - this
-     * must come AFTER we initialize the installdirs */
-    prte_setup_hostname();
-    /* add network aliases to our list of alias hostnames */
-    pmix_ifgetaliases(&prte_process_info.aliases);
-
-    /* pretty-print stack handlers */
-    if (PRTE_SUCCESS != (ret = prte_util_register_stackhandlers())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "register_stackhandlers", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* pre-load any default mca param files */
-    prte_preload_default_mca_params();
-    psched_register_params();
-
-    /* Register all MCA Params */
-    if (PRTE_SUCCESS != (ret = prte_register_params())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "register params", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    ret = pmix_mca_base_framework_open(&prte_prtebacktrace_base_framework,
-                                       PMIX_MCA_BASE_OPEN_DEFAULT);
-    if (PRTE_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "open backtrace", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /** setup callbacks for abort signals - from this point
-     * forward, we need to abort in a manner that allows us
-     * to cleanup. However, we cannot directly use libevent
-     * to trap these signals as otherwise we cannot respond
-     * to them if we are stuck in an event! So instead use
-     * the basic POSIX trap functions to handle the signal,
-     * and then let that signal handler do some magic to
-     * avoid the hang
-     *
-     * NOTE: posix traps don't allow us to do anything major
-     * in them, so use a pipe tied to a libevent event to
-     * reach a "safe" place where the termination event can
-     * be created
-     */
-    if (0 != pipe(term_pipe)) {
-        exit(1);
-    }
-
-    /*
-     * Initialize the event library
-     */
-    if (PRTE_SUCCESS != (ret = prte_event_base_open())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "event base open", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* setup an event to attempt normal termination on signal */
-    prte_event_set(prte_event_base, &term_handler, term_pipe[0], PRTE_EV_READ, clean_abort, NULL);
-    prte_event_add(&term_handler, NULL);
-    /* point the signal trap to a function that will activate that event */
-    signal(SIGTERM, abort_signal_callback);
-    signal(SIGINT, abort_signal_callback);
-    signal(SIGHUP, abort_signal_callback);
-
-    /* setup the locks */
-    if (PRTE_SUCCESS != (ret = prte_locks_init())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "locks init", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* Ensure the rest of the process info structure is initialized */
-    if (PRTE_SUCCESS != (ret = prte_proc_info())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "proc info", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    if (PRTE_SUCCESS != (ret = prte_hwloc_base_register())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "register hwloc", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* open hwloc */
-    prte_hwloc_base_open();
-    /* get the local topology */
-    ret = prte_hwloc_base_get_topology();
-    if (PRTE_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "get topology", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* setup the global job and node arrays */
-    prte_job_data = PMIX_NEW(pmix_pointer_array_t);
-    ret = pmix_pointer_array_init(prte_job_data,
-                                  PRTE_GLOBAL_ARRAY_BLOCK_SIZE,
-                                  PRTE_GLOBAL_ARRAY_MAX_SIZE,
-                                  PRTE_GLOBAL_ARRAY_BLOCK_SIZE);
-    if (PMIX_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "setup job array", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-    prte_node_pool = PMIX_NEW(pmix_pointer_array_t);
-    ret = pmix_pointer_array_init(prte_node_pool, PRTE_GLOBAL_ARRAY_BLOCK_SIZE,
-                                  PRTE_GLOBAL_ARRAY_MAX_SIZE,
-                                  PRTE_GLOBAL_ARRAY_BLOCK_SIZE);
-    if (PMIX_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "setup node array", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-    prte_node_topologies = PMIX_NEW(pmix_pointer_array_t);
-    ret = pmix_pointer_array_init(prte_node_topologies, PRTE_GLOBAL_ARRAY_BLOCK_SIZE,
-                                  PRTE_GLOBAL_ARRAY_MAX_SIZE,
-                                  PRTE_GLOBAL_ARRAY_BLOCK_SIZE);
-    if (PMIX_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "setup node topologies array", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-    /* initialize the cache */
-    prte_cache = PMIX_NEW(pmix_pointer_array_t);
-    pmix_pointer_array_init(prte_cache, 1, INT_MAX, 1);
-
-    /* setup the SCHIZO module */
-    psched_schizo_init();
-    schizo = &psched_schizo_module;
-
-    /* parse the CLI to load the MCA params */
-    PMIX_CONSTRUCT(&results, pmix_cli_result_t);
-    ret = schizo->parse_cli(pargv, &results, PMIX_CLI_SILENT);
-    if (PRTE_SUCCESS != ret) {
-        if (PRTE_OPERATION_SUCCEEDED == ret) {
-            return PRTE_SUCCESS;
-        }
-        if (PRTE_ERR_SILENT != ret) {
-            fprintf(stderr, "%s: command line error (%s)\n", prte_tool_basename,
-                    prte_strerror(ret));
-        }
-        return ret;
-    }
-
-    /* check if we are running as root - if we are, then only allow
-     * us to proceed if the allow-run-as-root flag was given. Otherwise,
-     * exit with a giant warning message
-     */
-    if (0 == geteuid()) {
-        schizo->allow_run_as_root(&results); // will exit us if not allowed
-    }
-
-    /* if we were given a keepalive pipe, set up to monitor it now */
-    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_KEEPALIVE);
-    if (NULL != opt) {
-        PMIX_SETENV_COMPAT("PMIX_KEEPALIVE_PIPE", opt->values[0], true, &environ);
-    }
-
-    /* check for debug options */
-    if (pmix_cmd_line_is_taken(&results, PRTE_CLI_DEBUG)) {
-        prte_debug_flag = true;
-        if (psched_globals.verbosity <= 0) {
-            // verbosity not previously set, so do so now
-            psched_globals.verbosity = 10;
-            psched_globals.output = pmix_output_open(NULL);
-            pmix_output_set_verbosity(psched_globals.output,
-                                      psched_globals.verbosity);
-            prte_pmix_server_globals.output = pmix_output_open(NULL);
-            pmix_output_set_verbosity(prte_pmix_server_globals.output,
-                                      psched_globals.verbosity);
-        }
-    }
-
-    // detach from controlling terminal, if so directed
-    if (pmix_cmd_line_is_taken(&results, PRTE_CLI_DAEMONIZE)) {
-        pipe(wait_pipe);
-        prte_state_base.parent_fd = wait_pipe[1];
-        prte_daemon_init_callback(NULL, wait_dvm);
-        close(wait_pipe[0]);
-#if defined(HAVE_SETSID)
-        /* see if we were directed to separate from current session */
-        if (pmix_cmd_line_is_taken(&results, PRTE_CLI_SET_SID)) {
-            setsid();
-        }
-#endif
-    }
-
-    if (pmix_cmd_line_is_taken(&results, PRTE_CLI_NO_READY_MSG)) {
-        prte_state_base.ready_msg = false;
-    } else {
-        prte_state_base.ready_msg = true;
-    }
-
-    /* if we were asked to report a uri, set the MCA param to do so */
-    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_REPORT_URI);
-    if (NULL != opt) {
-        prte_pmix_server_globals.report_uri = strdup(opt->values[0]);
-    }
-
-    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_REPORT_PID);
-    if (NULL != opt) {
-        /* if the string is a "-", then output to stdout */
-        if (0 == strcmp(opt->values[0], "-")) {
-            fprintf(stdout, "%lu\n", (unsigned long) getpid());
-        } else if (0 == strcmp(opt->values[0], "+")) {
-            /* output to stderr */
-            fprintf(stderr, "%lu\n", (unsigned long) getpid());
-        } else {
-            char *leftover;
-            int outpipe;
-            /* see if it is an integer pipe */
-            leftover = NULL;
-            outpipe = strtol(opt->values[0], &leftover, 10);
-            if (NULL == leftover || 0 == strlen(leftover)) {
-                /* stitch together the var names and URI */
-                pmix_asprintf(&leftover, "%lu", (unsigned long) getpid());
-                /* output to the pipe */
-                prc = pmix_fd_write(outpipe, strlen(leftover) + 1, leftover);
-                if (PMIX_SUCCESS != prc) {
-                    fprintf(stderr, "Error writing PID to pipe: %s\n", strerror(errno));
-                }
-                free(leftover);
-                close(outpipe);
-            } else {
-                /* must be a file */
-                FILE *fp;
-                fp = fopen(opt->values[0], "w");
-                if (NULL == fp) {
-                    pmix_output(0, "Impossible to open the file %s in write mode\n", opt->values[0]);
-                    PRTE_UPDATE_EXIT_STATUS(1);
-                    goto DONE;
-                }
-                /* output my PID */
-                fprintf(fp, "%lu\n", (unsigned long) getpid());
-                fclose(fp);
-                mypidfile = strdup(opt->values[0]);
-            }
-        }
-    }
-
-    /* ensure we silence any compression warnings */
-    PMIX_SETENV_COMPAT("PMIX_MCA_compress_base_silence_warning", "1", true, &environ);
-
-    /* run the prolog */
-    if (PRTE_SUCCESS != (ret = prte_ess_base_std_prolog())) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "prte_ess_base_std_prolog", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* setup the state machine */
-    psched_state_init();
-
-    /* setup the errmgr */
-    psched_errmgr_init();
-
-    /* set a name */
-    ret = prte_plm_base_set_hnp_name();
-    if (PRTE_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "set_hnp_name", PRTE_ERROR_NAME(ret), ret);
-        return ret;
-    }
-
-    /* create my job data object */
-    jdata = PMIX_NEW(prte_job_t);
-    PMIX_LOAD_NSPACE(jdata->nspace, PRTE_PROC_MY_NAME->nspace);
-    prte_set_job_data_object(jdata);
-
-    /* set the schizo personality to "psched" by default */
-    jdata->schizo = (struct prte_schizo_base_module_t *)schizo;
-
-    /* every job requires at least one app */
-    app = PMIX_NEW(prte_app_context_t);
-    app->app = strdup(argv[0]);
-    app->argv = PMIX_ARGV_COPY_COMPAT(argv);
-    pmix_pointer_array_set_item(jdata->apps, 0, app);
-    jdata->num_apps++;
-    /* create and store a node object where we are */
-    node = PMIX_NEW(prte_node_t);
-    node->name = strdup(prte_process_info.nodename);
-    node->index = PRTE_PROC_MY_NAME->rank;
-    PRTE_FLAG_SET(node, PRTE_NODE_FLAG_LOC_VERIFIED);
-    pmix_pointer_array_set_item(prte_node_pool, PRTE_PROC_MY_NAME->rank, node);
-
-    /* create and store a proc object for us */
-    pptr = PMIX_NEW(prte_proc_t);
-    PMIX_LOAD_PROCID(&pptr->name, PRTE_PROC_MY_NAME->nspace, PRTE_PROC_MY_NAME->rank);
-    pptr->pid = prte_process_info.pid;
-    pptr->state = PRTE_PROC_STATE_RUNNING;
-    PMIX_RETAIN(node); /* keep accounting straight */
-    pptr->node = node;
-    pmix_pointer_array_set_item(jdata->procs, PRTE_PROC_MY_NAME->rank, pptr);
-
-    /* create the directory tree */
-    ret = prte_session_dir(PRTE_PROC_MY_NAME);
-    if (PRTE_SUCCESS != ret) {
-        pmix_show_help("help-prte-runtime",
-                       "prte_init:startup:internal-failure", true,
-                       "session_dir", PRTE_ERROR_NAME(ret), ret);
-        prte_exit_status = ret;
-        goto DONE;
-    }
-
-    /* setup the PMIx server library */
-    if (PRTE_SUCCESS != (ret = psched_server_init(&results))) {
-        /* the server code already barked, so let's be quiet */
-        prte_exit_status = PRTE_ERR_SILENT;
-        goto DONE;
-    }
-
-    if (pmix_cmd_line_is_taken(&results, PRTE_CLI_KEEPALIVE)) {
-        /* setup the keepalive event registration */
-        memset(&xfer, 0, sizeof(myxfer_t));
-        PRTE_PMIX_CONSTRUCT_LOCK(&xfer.lock);
-        code = PMIX_ERR_JOB_TERMINATED;
-        PMIX_LOAD_PROCID(&pname, "PMIX_KEEPALIVE_PIPE", PMIX_RANK_UNDEF);
-        PMIX_INFO_LOAD(&info, PMIX_EVENT_AFFECTED_PROC, &pname, PMIX_PROC);
-        PMIx_Register_event_handler(&code, 1, &info, 1, parent_died_fn, evhandler_reg_callbk,
-                                    (void *) &xfer);
-        PRTE_PMIX_WAIT_THREAD(&xfer.lock);
-        PMIX_INFO_DESTRUCT(&info);
-        PRTE_PMIX_DESTRUCT_LOCK(&xfer.lock);
-    }
-
-    // pass along any hostfile option
-    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_HOSTFILE);
-    if (NULL != opt) {
-        prte_set_attribute(&app->attributes, PRTE_APP_HOSTFILE, PRTE_ATTR_GLOBAL,
-                           opt->values[0], PMIX_STRING);
-    }
-
-    // pass along any dash-host option
-    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_HOST);
-    if (NULL != opt) {
-        prte_set_attribute(&app->attributes, PRTE_APP_DASH_HOST, PRTE_ATTR_GLOBAL,
-                           opt->values[0], PMIX_STRING);
-    }
-
-    /* setup to detect any external allocation */
-    ret = pmix_mca_base_framework_open(&prte_ras_base_framework,
-                                       PMIX_MCA_BASE_OPEN_DEFAULT);
-    if (PRTE_SUCCESS != ret) {
-        PRTE_ERROR_LOG(ret);
-        prte_exit_status = ret;
-        goto DONE;
-    }
-    if (PRTE_SUCCESS != (ret = prte_ras_base_select())) {
-        PRTE_ERROR_LOG(ret);
-        prte_exit_status = ret;
-        goto DONE;
-    }
-
-    /* add our topology to the array of known topologies */
-    t = PMIX_NEW(prte_topology_t);
-    t->topo = prte_hwloc_topology;
-    /* generate the signature */
-    prte_topo_signature = prte_hwloc_base_get_topo_signature(prte_hwloc_topology);
-    t->sig = strdup(prte_topo_signature);
-    t->index = pmix_pointer_array_add(prte_node_topologies, t);
-    node->topology = t;
-    node->available = prte_hwloc_base_filter_cpus(prte_hwloc_topology);
-    if (15 < pmix_output_get_verbosity(prte_ess_base_framework.framework_output)) {
-        char *output = NULL;
-        pmix_output(0, "%s Topology Info:", PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-        prte_hwloc_print(&output, "\t", prte_hwloc_topology);
-        pmix_output(0, "%s", output);
-        free(output);
-    }
-
-    // check for default hostfile CLI option
-    opt = pmix_cmd_line_get_param(&results, PRTE_CLI_DEFAULT_HOSTFILE);
-    if (NULL != opt) {
-        if (NULL != prte_default_hostfile) {
-            // command line overrides environ
-            free(prte_default_hostfile);
-        }
-        prte_default_hostfile = strdup(opt->values[0]);
-        prte_default_hostfile_given = true;
-    }
-
-    // setup the scheduler itself
-    psched_scheduler_init();
-
-    /* output a message indicating we are alive, our name, and our pid */
-    if (prte_state_base.ready_msg) {
-        fprintf(stderr, "Scheduler %s checking in as pid %ld on host %s\n",
-                PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), (long) prte_process_info.pid,
-                prte_process_info.nodename);
-    }
-
-    // trigger the state event to read the allocation
-    PRTE_ACTIVATE_JOB_STATE(jdata, PRTE_JOB_STATE_ALLOCATE);
-
-    /* loop the event lib until an exit event is detected */
-    while (prte_event_base_active) {
-        prte_event_loop(prte_event_base, PRTE_EVLOOP_ONCE);
-    }
-    PMIX_ACQUIRE_OBJECT(prte_event_base_active);
-
-DONE:
-    /* update the exit status, in case it wasn't done */
-    PRTE_UPDATE_EXIT_STATUS(ret);
-
-    /* cleanup and leave */
-    if (NULL != mypidfile) {
-        unlink(mypidfile);
-    }
-    psched_server_finalize();
-
-    /* release our internal job object - this
-     * also purges the session dir tree */
-    PMIX_RELEASE(jdata);
-
-    /* cleanup the process info */
-    prte_proc_info_finalize();
-
-    if (prte_debug_flag) {
-        fprintf(stderr, "exiting with status %d\n", prte_exit_status);
-    }
-    exit(prte_exit_status);
-}
-
-static void clean_abort(int fd, short flags, void *arg)
-{
-    PRTE_HIDE_UNUSED_PARAMS(fd, flags, arg);
-
-    /* if we have already ordered this once, don't keep
-     * doing it to avoid race conditions
-     */
-    if (pmix_mutex_trylock(&abort_inprogress_lock)) { /* returns 1 if already locked */
-        if (forcibly_die) {
-            /* exit with a non-zero status */
-            exit(1);
-        }
-        fprintf(stderr,
-                "%s: abort is already in progress...hit ctrl-c again to forcibly terminate\n\n",
-                prte_tool_basename);
-        forcibly_die = true;
-        /* reset the event */
-        prte_event_add(&term_handler, NULL);
-        return;
-    }
-
-    fflush(stderr);
-    /* ensure we exit with a non-zero status */
-    PRTE_UPDATE_EXIT_STATUS(PRTE_ERROR_DEFAULT_EXIT_CODE);
-    // stop the event loop
-    prte_event_base_active = false;
-}
-
-static bool first = true;
-static bool second = true;
-
-/*
- * Attempt to terminate and wait for callback
- */
-static void abort_signal_callback(int fd)
-{
-    uint8_t foo = 1;
-    char *msg = "Abort is in progress...hit ctrl-c again to forcibly terminate\n\n";
-    PRTE_HIDE_UNUSED_PARAMS(fd);
-
-    /* if this is the first time thru, just get
-     * the current time
-     */
-    if (first) {
-        first = false;
-        /* tell the event lib to attempt to abnormally terminate */
-        if (-1 == write(term_pipe[1], &foo, 1)) {
-            exit(1);
-        }
-    } else if (second) {
-        if (-1 == write(2, (void *) msg, strlen(msg))) {
-            exit(1);
-        }
-        fflush(stderr);
-        second = false;
-    } else {
-        pmix_os_dirpath_destroy(prte_process_info.top_session_dir, true, NULL);
-        exit(1);
-    }
-}
diff --git a/src/tools/psched/psched.h b/src/tools/psched/psched.h
deleted file mode 100644
index 67575908ce..0000000000
--- a/src/tools/psched/psched.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright (c) 2004-2010 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) 2007-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2012-2013 Los Alamos National Security, LLC.
- *                         All rights reserved
- * Copyright (c) 2014-2019 Intel, Inc.  All rights reserved.
- * Copyright (c) 2021-2023 Nanook Consulting.  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#ifndef PSCHED_H
-#define PSCHED_H
-
-#include "prte_config.h"
-
-#include "src/pmix/pmix-internal.h"
-#include "src/class/pmix_list.h"
-#include "src/class/pmix_pointer_array.h"
-#include "src/mca/schizo/schizo.h"
-#include "src/mca/state/state.h"
-
-BEGIN_C_DECLS
-
-typedef struct {
-    bool initialized;
-    pmix_pointer_array_t requests;
-    pmix_list_t tools;
-    pmix_proc_t syscontroller;
-    bool controller_connected;
-    int verbosity;
-    int output;
-    int scheduler_output;
-} psched_globals_t;
-
-extern psched_globals_t psched_globals;
-
-extern void psched_schizo_init(void);
-extern void psched_state_init(void);
-extern void psched_errmgr_init(void);
-extern int psched_server_init(pmix_cli_result_t *results);
-extern void psched_server_finalize(void);
-extern void psched_scheduler_init(void);
-extern void psched_scheduler_finalize(void);
-extern void psched_register_params(void);
-
-extern pmix_status_t psched_register_events_fn(pmix_status_t *codes, size_t ncodes,
-                                               const pmix_info_t info[], size_t ninfo,
-                                               pmix_op_cbfunc_t cbfunc, void *cbdata);
-
-extern pmix_status_t psched_deregister_events_fn(pmix_status_t *codes,
-                                                 size_t ncodes,
-                                                 pmix_op_cbfunc_t cbfunc,
-                                                 void *cbdata);
-
-extern pmix_status_t psched_notify_event(pmix_status_t code,
-                                         const pmix_proc_t *source,
-                                         pmix_data_range_t range,
-                                         pmix_info_t info[], size_t ninfo,
-                                         pmix_op_cbfunc_t cbfunc, void *cbdata);
-
-extern pmix_status_t psched_query_fn(pmix_proc_t *proct,
-                                     pmix_query_t *queries, size_t nqueries,
-                                     pmix_info_cbfunc_t cbfunc, void *cbdata);
-
-extern void psched_tool_connected_fn(pmix_info_t *info, size_t ninfo,
-                                    pmix_tool_connection_cbfunc_t cbfunc, void *cbdata);
-
-extern pmix_status_t psched_job_ctrl_fn(const pmix_proc_t *requestor,
-                                        const pmix_proc_t targets[], size_t ntargets,
-                                        const pmix_info_t directives[], size_t ndirs,
-                                        pmix_info_cbfunc_t cbfunc, void *cbdata);
-
-extern pmix_status_t psched_alloc_fn(const pmix_proc_t *client,
-                                     pmix_alloc_directive_t directive,
-                                     const pmix_info_t data[], size_t ndata,
-                                     pmix_info_cbfunc_t cbfunc, void *cbdata);
-
-#if PMIX_NUMERIC_VERSION >= 0x00050000
-extern pmix_status_t psched_session_ctrl_fn(const pmix_proc_t *requestor,
-                                            uint32_t sessionID,
-                                            const pmix_info_t directives[], size_t ndirs,
-                                            pmix_info_cbfunc_t cbfunc, void *cbdata);
-#endif
-
-// global objects
-extern prte_schizo_base_module_t psched_schizo_module;
-extern pmix_list_t prte_psched_states;
-
-typedef int32_t prte_sched_state_t;
-#define PSCHED_STATE_ANY                INT32_MAX
-#define PSCHED_STATE_UNDEF               0
-#define PSCHED_STATE_INIT                1
-#define PSCHED_STATE_QUEUE               2
-#define PSCHED_STATE_SESSION_COMPLETE   30
-
-/* Define a boundary so we can easily and quickly determine
- * if a scheduler operation abnormally terminated - leave a little room
- * for future expansion
- */
-#define PSCHED_STATE_ERROR          50
-
-typedef struct {
-    pmix_list_item_t super;
-    prte_sched_state_t sched_state;
-    prte_state_cbfunc_t cbfunc;
-} psched_state_t;
-PRTE_EXPORT PMIX_CLASS_DECLARATION(psched_state_t);
-
-PRTE_EXPORT extern pmix_list_t prte_psched_states;
-
-/* track a session throughout its lifecycle */
-typedef struct {
-    /** Base object so this can be put on a list */
-    pmix_list_item_t super;
-    prte_event_t ev;
-    // allocation request info
-    pmix_proc_t requestor;
-    pmix_alloc_directive_t directive;
-    // whether the data is a local copy
-    bool copy;
-    // original info keys
-    pmix_info_t *data;
-    size_t ndata;
-    // callback upon completion
-    pmix_info_cbfunc_t cbfunc;
-    void *cbdata;
-    // processed directives
-    char *user_refid;
-    char *alloc_refid;
-    uint64_t num_nodes;
-    char *nlist;
-    char *exclude;
-    uint64_t num_cpus;
-    char *ncpulist;
-    char *cpulist;
-    float memsize;
-    char *time;
-    char *queue;
-    bool preemptible;
-    char *lend;
-    char *image;
-    bool waitall;
-    bool share;
-    bool noshell;
-    char *dependency;
-    char *begintime;
-    // internal tracking info
-    prte_sched_state_t state;
-    // assigned session info
-    uint32_t sessionID;
-} psched_req_t;
-PRTE_EXPORT PMIX_CLASS_DECLARATION(psched_req_t);
-
-extern const char* prte_sched_state_to_str(prte_sched_state_t s);
-// scheduler operations
-extern void psched_activate_sched_state(psched_req_t *req, prte_sched_state_t state);
-extern void psched_request_init(int fd, short args, void *cbdata);
-extern void psched_request_queue(int fd, short args, void *cbdata);
-extern void psched_session_complete(int fd, short args, void *cbdata);
-
-
-#define PRTE_ACTIVATE_SCHED_STATE(j, s)                                             \
-    do {                                                                            \
-        psched_req_t *shadow = (j);                                                 \
-        if (psched_globals.verbosity > 0) {                                         \
-            double timestamp = 0.0;                                                 \
-            PRTE_STATE_GET_TIMESTAMP(timestamp);                                    \
-            pmix_output_verbose(1, psched_globals.output,      \
-                                "%s [%f] ACTIVATE SCHED %s STATE %s AT %s:%d",      \
-                                PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), timestamp,      \
-                                (NULL == shadow->alloc_refid) ? "NO REFID" : shadow->alloc_refid,    \
-                                prte_sched_state_to_str((s)), __FILE__, __LINE__);  \
-        }                                                                           \
-        psched_activate_sched_state(shadow, (s));                                   \
-    } while (0);
-
-#define PRTE_REACHING_SCHED_STATE(j, s)                                             \
-    do {                                                                            \
-        psched_req_t *shadow = (j);                                                 \
-        if (psched_globals.verbosity > 0) {                      \
-            double timestamp = 0.0;                                                 \
-            PRTE_STATE_GET_TIMESTAMP(timestamp);                                    \
-            pmix_output_verbose(1, psched_globals.output,      \
-                                "%s [%f] ACTIVATING SCHED %s STATE %s AT %s:%d",             \
-                                PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), timestamp,      \
-                                (NULL == shadow->alloc_refid) ? "NO REFID" : shadow->alloc_refid,    \
-                                prte_sched_state_to_str((s)), __FILE__, __LINE__);                      \
-            shadow->state = (s);                                                    \
-        }                                                                           \
-    } while (0);
-
-#define PSCHED_THREADSHIFT(c, fn)                                                   \
-    do {                                                                            \
-        prte_event_set(prte_event_base, &((c)->ev), -1, PRTE_EV_WRITE, (fn), (c));  \
-        PMIX_POST_OBJECT(c);                                                        \
-        prte_event_active(&((c)->ev), PRTE_EV_WRITE, 1);                            \
-    } while (0);
-
-END_C_DECLS
-
-#endif /* PSCHED_H */
diff --git a/src/tools/psched/queries.c b/src/tools/psched/queries.c
deleted file mode 100644
index 798b6115b3..0000000000
--- a/src/tools/psched/queries.c
+++ /dev/null
@@ -1,828 +0,0 @@
-/*
- * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2011 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-2013 Los Alamos National Security, LLC.
- *                         All rights reserved.
- * Copyright (c) 2009-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2017 Mellanox Technologies, Inc.
- *                         All rights reserved.
- * Copyright (c) 2014-2019 Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2020      IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- *
- */
-
-#include "prte_config.h"
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-
-#include "src/hwloc/hwloc-internal.h"
-#include "src/pmix/pmix-internal.h"
-#include "src/util/pmix_argv.h"
-#include "src/util/pmix_os_path.h"
-#include "src/util/pmix_path.h"
-#include "src/util/pmix_output.h"
-
-#include "src/mca/errmgr/errmgr.h"
-#include "src/mca/iof/iof.h"
-#include "src/mca/plm/base/plm_private.h"
-#include "src/mca/plm/plm.h"
-#include "src/mca/rmaps/rmaps_types.h"
-#include "src/rml/rml.h"
-#include "src/mca/schizo/schizo.h"
-#include "src/mca/state/state.h"
-#include "src/runtime/prte_globals.h"
-#include "src/threads/pmix_threads.h"
-#include "src/util/name_fns.h"
-#include "src/util/pmix_show_help.h"
-
-#include "src/prted/pmix/pmix_server_internal.h"
-#include "src/tools/psched/psched.h"
-
-static void qrel(void *cbdata)
-{
-    prte_pmix_server_op_caddy_t *cd = (prte_pmix_server_op_caddy_t *) cbdata;
-    if (NULL != cd->info) {
-        PMIX_INFO_FREE(cd->info, cd->ninfo);
-    }
-    PMIX_RELEASE(cd);
-}
-
-static void _query(int sd, short args, void *cbdata)
-{
-    prte_pmix_server_op_caddy_t *cd = (prte_pmix_server_op_caddy_t *) cbdata;
-    prte_pmix_server_op_caddy_t *rcd;
-    pmix_query_t *q;
-    pmix_status_t ret = PMIX_SUCCESS;
-    void *results, *plist, *stack, *cache;
-    prte_info_item_t *kv;
-    pmix_nspace_t jobid;
-    prte_job_t *jdata;
-    prte_node_t *node, *ndptr;
-    int j, k, rc;
-    size_t m, n, p;
-    uint32_t key, nodeid;
-    char **nspaces, *hostname, *uri;
-    char *cmdline;
-    char **ans, *tmp;
-    char *psetname;
-    prte_app_context_t *app;
-    int matched;
-    pmix_proc_info_t *procinfo;
-    pmix_data_array_t dry;
-    prte_proc_t *proct;
-    pmix_proc_t *proc;
-    size_t sz;
-    PRTE_HIDE_UNUSED_PARAMS(sd, args);
-
-    PMIX_ACQUIRE_OBJECT(cd);
-
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
-                        "%s processing query",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    PMIX_INFO_LIST_START(results);
-
-    /* see what they wanted */
-    for (m = 0; m < cd->nqueries; m++) {
-        q = &cd->queries[m];
-        hostname = NULL;
-        nodeid = UINT32_MAX;
-        psetname = NULL;
-        /* default to the requestor's jobid */
-        PMIX_LOAD_NSPACE(jobid, cd->proct.nspace);
-        /* see if they provided any qualifiers */
-        if (NULL != q->qualifiers && 0 < q->nqual) {
-            for (n = 0; n < q->nqual; n++) {
-                pmix_output_verbose(2, prte_pmix_server_globals.output,
-                                    "%s qualifier key \"%s\" : value \"%s\"",
-                                    PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), q->qualifiers[n].key,
-                                    (q->qualifiers[n].value.type == PMIX_STRING
-                                         ? q->qualifiers[n].value.data.string
-                                         : "(not a string)"));
-
-                if (PMIX_CHECK_KEY(&q->qualifiers[n], PMIX_NSPACE)) {
-                    /* Never trust the namespace string that is provided.
-                     * First check to see if we know about this namespace. If
-                     * not then return an error. If so then continue on.
-                     */
-                    /* Make sure the qualifier namespace exists */
-                    matched = 0;
-                    for (k = 0; k < prte_job_data->size; k++) {
-                        jdata = (prte_job_t *) pmix_pointer_array_get_item(prte_job_data, k);
-                        if (NULL != jdata) {
-                            if (PMIX_CHECK_NSPACE(q->qualifiers[n].value.data.string, jdata->nspace)) {
-                                matched = 1;
-                                break;
-                            }
-                        }
-                    }
-                    if (0 == matched) {
-                        pmix_output_verbose(2, prte_pmix_server_globals.output,
-                                            "%s qualifier key \"%s\" : value \"%s\" is an unknown namespace",
-                                            PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), q->qualifiers[n].key,
-                                            q->qualifiers[n].value.data.string);
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-
-                    PMIX_LOAD_NSPACE(jobid, q->qualifiers[n].value.data.string);
-                    if (PMIX_NSPACE_INVALID(jobid)) {
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-
-                } else if (PMIX_CHECK_KEY(&q->qualifiers[n], PMIX_GROUP_ID)) {
-                    /* Never trust the group string that is provided.
-                     * First check to see if we know about this group. If
-                     * not then return an error. If so then continue on.
-                     */
-                    /* Make sure the qualifier group exists */
-                    matched = 0;
-                    pmix_server_pset_t *ps;
-                    PMIX_LIST_FOREACH(ps, &prte_pmix_server_globals.groups, pmix_server_pset_t)
-                    {
-                        if (PMIX_CHECK_NSPACE(q->qualifiers[n].value.data.string, ps->name)) {
-                            matched = 1;
-                            break;
-                        }
-                    }
-                    if (0 == matched) {
-                        pmix_output_verbose(2, prte_pmix_server_globals.output,
-                                            "%s qualifier key \"%s\" : value \"%s\" is an unknown group",
-                                            PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), q->qualifiers[n].key,
-                                            q->qualifiers[n].value.data.string);
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-                    PMIX_LOAD_NSPACE(jobid, q->qualifiers[n].value.data.string);
-                    if (PMIX_NSPACE_INVALID(jobid)) {
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-
-                } else if (PMIX_CHECK_KEY(&q->qualifiers[n], PMIX_HOSTNAME)) {
-                    hostname = q->qualifiers[n].value.data.string;
-
-                } else if (PMIX_CHECK_KEY(&q->qualifiers[n], PMIX_NODEID)) {
-                    PMIX_VALUE_GET_NUMBER(rc, &q->qualifiers[n].value, nodeid, uint32_t);
-
-                } else if (PMIX_CHECK_KEY(&q->qualifiers[n], PMIX_PSET_NAME)) {
-                    psetname = q->qualifiers[n].value.data.string;
-                }
-
-            }
-        }
-        for (n = 0; NULL != q->keys[n]; n++) {
-            pmix_output_verbose(2, prte_pmix_server_globals.output,
-                                "%s processing key %s",
-                                PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), q->keys[n]);
-
-            if (0 == strcmp(q->keys[n], PMIX_QUERY_NAMESPACES)) {
-                /* get the current jobids */
-                nspaces = NULL;
-                for (k = 0; k < prte_job_data->size; k++) {
-                    jdata = (prte_job_t *) pmix_pointer_array_get_item(prte_job_data, k);
-                    if (NULL == jdata) {
-                        continue;
-                    }
-                    /* don't show the requestor's job */
-                    if (!PMIX_CHECK_NSPACE(PRTE_PROC_MY_NAME->nspace, jdata->nspace)) {
-                        PMIX_ARGV_APPEND_NOSIZE_COMPAT(&nspaces, jdata->nspace);
-                    }
-                }
-                /* join the results into a single comma-delimited string */
-                tmp = PMIX_ARGV_JOIN_COMPAT(nspaces, ',');
-                PMIX_ARGV_FREE_COMPAT(nspaces);
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NAMESPACES, tmp, PMIX_STRING);
-                free(tmp);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_NAMESPACE_INFO)) {
-                PMIX_INFO_LIST_START(cache);
-                /* get the current jobids */
-                for (k = 0; k < prte_job_data->size; k++) {
-                    jdata = (prte_job_t *) pmix_pointer_array_get_item(prte_job_data, k);
-                    if (NULL == jdata) {
-                        continue;
-                    }
-                    /* don't show the requestor's job */
-                    if (!PMIX_CHECK_NSPACE(PRTE_PROC_MY_NAME->nspace, jdata->nspace)) {
-                        PMIX_INFO_LIST_START(stack);
-                        /* add the nspace name */
-                        PMIX_INFO_LIST_ADD(rc, stack, PMIX_NSPACE, jdata->nspace, PMIX_STRING);
-                        if (PMIX_SUCCESS != rc) {
-                            PMIX_ERROR_LOG(rc);
-                            PMIX_INFO_LIST_RELEASE(stack);
-                            goto done;
-                        }
-                        /* add the cmd line */
-                        app = (prte_app_context_t *) pmix_pointer_array_get_item(jdata->apps, 0);
-                        if (NULL == app) {
-                            ret = PMIX_ERR_NOT_FOUND;
-                            goto done;
-                        }
-                        cmdline = PMIX_ARGV_JOIN_COMPAT(app->argv, ' ');
-                        PMIX_INFO_LIST_ADD(rc, stack, PMIX_CMD_LINE, cmdline, PMIX_STRING);
-                        free(cmdline);
-                        /* add the job size */
-                        PMIX_INFO_LIST_ADD(rc, stack, PMIX_JOB_SIZE, &jdata->num_procs, PMIX_UINT32);
-                        if (PMIX_SUCCESS != rc) {
-                            PMIX_ERROR_LOG(rc);
-                            PMIX_INFO_LIST_RELEASE(stack);
-                            goto done;
-                        }
-                        /* construct info on each process in the job */
-                        for (j=0; j < jdata->procs->size; j++) {
-                            proct = (prte_proc_t*)pmix_pointer_array_get_item(jdata->procs, j);
-                            if (NULL == proct) {
-                                continue;
-                            }
-                            PMIX_INFO_LIST_START(plist);
-                            /* add the proc's rank */
-                            PMIX_INFO_LIST_ADD(rc, plist, PMIX_RANK, &proct->name.rank, PMIX_PROC_RANK);
-                            if (PMIX_SUCCESS != rc) {
-                                PMIX_ERROR_LOG(rc);
-                                PMIX_INFO_LIST_RELEASE(stack);
-                                PMIX_INFO_LIST_RELEASE(plist);
-                                goto done;
-                            }
-                            /* add the proc's hostname */
-                            PMIX_INFO_LIST_ADD(rc, plist, PMIX_HOSTNAME, proct->node->name, PMIX_STRING);
-                            if (PMIX_SUCCESS != rc) {
-                                PMIX_ERROR_LOG(rc);
-                                PMIX_INFO_LIST_RELEASE(stack);
-                                PMIX_INFO_LIST_RELEASE(plist);
-                                goto done;
-                            }
-                            /* add the proc's local rank */
-                            PMIX_INFO_LIST_ADD(rc, plist, PMIX_LOCAL_RANK, &proct->local_rank, PMIX_UINT16);
-                            if (PMIX_SUCCESS != rc) {
-                                PMIX_ERROR_LOG(rc);
-                                PMIX_INFO_LIST_RELEASE(stack);
-                                PMIX_INFO_LIST_RELEASE(plist);
-                                goto done;
-                            }
-                            /* add to the stack */
-                            PMIX_INFO_LIST_CONVERT(rc, plist, &dry);
-                            if (PMIX_SUCCESS != rc) {
-                                PMIX_ERROR_LOG(rc);
-                                PMIX_INFO_LIST_RELEASE(stack);
-                                PMIX_INFO_LIST_RELEASE(plist);
-                                goto done;
-                            }
-                            PMIX_INFO_LIST_RELEASE(plist);
-                            PMIX_INFO_LIST_ADD(rc, stack, PMIX_PROC_INFO_ARRAY, &dry, PMIX_DATA_ARRAY);
-                            PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                        }
-                        /* add the result to our cache */
-                        PMIX_INFO_LIST_CONVERT(rc, stack, &dry);
-                        if (PMIX_SUCCESS != rc) {
-                            PMIX_ERROR_LOG(rc);
-                            PMIX_INFO_LIST_RELEASE(stack);
-                            goto done;
-                        }
-                        PMIX_INFO_LIST_RELEASE(stack);
-                        PMIX_INFO_LIST_ADD(rc, cache, PMIX_JOB_INFO_ARRAY, &dry, PMIX_DATA_ARRAY);
-                        PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                    }
-                }
-                /* add our findings to the results */
-                PMIX_INFO_LIST_CONVERT(rc, cache, &dry);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    PMIX_INFO_LIST_RELEASE(cache);
-                    goto done;
-                }
-                PMIX_INFO_LIST_RELEASE(cache);
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NAMESPACE_INFO, &dry, PMIX_DATA_ARRAY);
-                PMIX_DATA_ARRAY_DESTRUCT(&dry);
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_SPAWN_SUPPORT)) {
-                ans = NULL;
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_HOST);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_HOSTFILE);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_ADD_HOST);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_ADD_HOSTFILE);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_PREFIX);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_WDIR);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_MAPPER);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_PPR);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_MAPBY);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_RANKBY);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_BINDTO);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_COSPAWN_APP);
-                /* create the return kv */
-                tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
-                PMIX_ARGV_FREE_COMPAT(ans);
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_SPAWN_SUPPORT, tmp, PMIX_STRING);
-                free(tmp);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_DEBUG_SUPPORT)) {
-                ans = NULL;
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_DEBUG_STOP_IN_INIT);
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_DEBUG_STOP_IN_APP);
-#if PRTE_HAVE_STOP_ON_EXEC
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_DEBUG_STOP_ON_EXEC);
-#endif
-                PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, PMIX_DEBUG_TARGET);
-                /* create the return kv */
-                tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
-                PMIX_ARGV_FREE_COMPAT(ans);
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_DEBUG_SUPPORT, tmp, PMIX_STRING);
-                free(tmp);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_HWLOC_XML_V1)) {
-                if (NULL != prte_hwloc_topology) {
-                    char *xmlbuffer = NULL;
-                    int len;
-                    kv = PMIX_NEW(prte_info_item_t);
-#if HWLOC_API_VERSION < 0x20000
-                    /* get this from the v1.x API */
-                    if (0 != hwloc_topology_export_xmlbuffer(prte_hwloc_topology, &xmlbuffer, &len)) {
-                        PMIX_RELEASE(kv);
-                        continue;
-                    }
-#else
-                    /* get it from the v2 API */
-                    if (0 != hwloc_topology_export_xmlbuffer(prte_hwloc_topology, &xmlbuffer, &len,
-                                                             HWLOC_TOPOLOGY_EXPORT_XML_FLAG_V1)) {
-                        PMIX_RELEASE(kv);
-                        continue;
-                    }
-#endif
-                    PMIX_INFO_LIST_ADD(rc, results, PMIX_HWLOC_XML_V1, xmlbuffer, PMIX_STRING);
-                    free(xmlbuffer);
-                    if (PMIX_SUCCESS != rc) {
-                        PMIX_ERROR_LOG(rc);
-                        goto done;
-                    }
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_HWLOC_XML_V2)) {
-                /* we cannot provide it if we are using v1.x */
-#if HWLOC_API_VERSION >= 0x20000
-                if (NULL != prte_hwloc_topology) {
-                    char *xmlbuffer = NULL;
-                    int len;
-                    kv = PMIX_NEW(prte_info_item_t);
-                    if (0 != hwloc_topology_export_xmlbuffer(prte_hwloc_topology, &xmlbuffer, &len, 0)) {
-                        PMIX_RELEASE(kv);
-                        continue;
-                    }
-                    PMIX_INFO_LIST_ADD(rc, results, PMIX_HWLOC_XML_V2, xmlbuffer, PMIX_STRING);
-                    free(xmlbuffer);
-                    if (PMIX_SUCCESS != rc) {
-                        PMIX_ERROR_LOG(rc);
-                        goto done;
-                    }
-                }
-#endif
-
-            } else if (0 == strcmp(q->keys[n], PMIX_PROC_URI)) {
-                /* they want our URI */
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_PROC_URI, prte_process_info.my_hnp_uri, PMIX_STRING);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_SERVER_URI)) {
-                /* they want the PMIx URI */
-                if (NULL != hostname) {
-                    /* find the node object */
-                    node = NULL;
-                    for (k = 0; k < prte_node_pool->size; k++) {
-                        ndptr = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, k);
-                        if (NULL == ndptr) {
-                            continue;
-                        }
-                        if (0 == strcmp(hostname, ndptr->name)) {
-                            node = ndptr;
-                            break;
-                        }
-                    }
-                    if (NULL == node) {
-                        /* unknown node */
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-                    /* we want the info for the server on that node */
-                    if (NULL == node->daemon) {
-                        /* not found */
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-                    proct = node->daemon;
-                } else if (UINT32_MAX != nodeid) {
-                    /* get the node object at that index */
-                    node = (prte_node_t *) pmix_pointer_array_get_item(prte_node_pool, nodeid);
-                    if (NULL == node) {
-                        /* bad index */
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-                    /* we want the info for the server on that node */
-                    if (NULL == node->daemon) {
-                        /* not found */
-                        ret = PMIX_ERR_BAD_PARAM;
-                        goto done;
-                    }
-                    proct = node->daemon;
-                } else {
-                    /* send them ours */
-                    proct = prte_get_proc_object(PRTE_PROC_MY_NAME);
-                }
-                /* get the server uri value - we can block here as we are in
-                 * an PRTE progress thread */
-                PRTE_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_SERVER_URI, &proct->name,
-                                               (char **) &uri, PMIX_STRING);
-                if (PRTE_SUCCESS != rc) {
-                    ret = prte_pmix_convert_rc(rc);
-                    goto done;
-                }
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_SERVER_URI, uri, PMIX_STRING);
-                free(uri);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_PROC_TABLE)) {
-                /* construct a list of values with prte_proc_info_t
-                 * entries for each proc in the indicated job */
-                jdata = prte_get_job_data_object(jobid);
-                if (NULL == jdata) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* Check if there are any entries in global proctable */
-                if (0 == jdata->num_procs) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* cycle thru the job and create an entry for each proc */
-                PMIX_DATA_ARRAY_CONSTRUCT(&dry, jdata->num_procs, PMIX_PROC_INFO);
-                procinfo = (pmix_proc_info_t*)dry.array;
-                p = 0;
-                for (k = 0; k < jdata->procs->size; k++) {
-                    proct = (prte_proc_t *) pmix_pointer_array_get_item(jdata->procs, k);
-                    if (NULL == proct) {
-                        continue;
-                    }
-                    PMIX_LOAD_PROCID(&procinfo[p].proc, proct->name.nspace, proct->name.rank);
-                    if (NULL != proct->node && NULL != proct->node->name) {
-                        procinfo[p].hostname = strdup(proct->node->name);
-                    }
-                    app = (prte_app_context_t *) pmix_pointer_array_get_item(jdata->apps,
-                                                                             proct->app_idx);
-                    if (NULL != app && NULL != app->app) {
-                        if (pmix_path_is_absolute(app->app)) {
-                            procinfo[p].executable_name = strdup(app->app);
-                        } else {
-                            procinfo[p].executable_name = pmix_os_path(false, app->cwd, app->app, NULL);
-                        }
-                    }
-                    procinfo[p].pid = proct->pid;
-                    procinfo[p].exit_code = proct->exit_code;
-                    procinfo[p].state = prte_pmix_convert_state(proct->state);
-                    ++p;
-                }
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_PROC_TABLE, &dry, PMIX_DATA_ARRAY);
-                PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_LOCAL_PROC_TABLE)) {
-                /* construct a list of values with prte_proc_info_t
-                 * entries for each LOCAL proc in the indicated job */
-                jdata = prte_get_job_data_object(jobid);
-                if (NULL == jdata) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* Check if there are any entries in local proctable */
-                if (0 == jdata->num_local_procs) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* cycle thru the job and create an entry for each proc */
-                PMIX_DATA_ARRAY_CONSTRUCT(&dry, jdata->num_local_procs, PMIX_PROC_INFO);
-                procinfo = (pmix_proc_info_t *) dry.array;
-                p = 0;
-                for (k = 0; k < jdata->procs->size; k++) {
-                    proct = (prte_proc_t *) pmix_pointer_array_get_item(jdata->procs, k);
-                    if (NULL == proct) {
-                        continue;
-                    }
-                    if (PRTE_FLAG_TEST(proct, PRTE_PROC_FLAG_LOCAL)) {
-                        PMIX_LOAD_PROCID(&procinfo[p].proc, proct->name.nspace, proct->name.rank);
-                        if (NULL != proct->node && NULL != proct->node->name) {
-                            procinfo[p].hostname = strdup(proct->node->name);
-                        }
-                        app = (prte_app_context_t *) pmix_pointer_array_get_item(jdata->apps,
-                                                                                 proct->app_idx);
-                        if (NULL != app && NULL != app->app) {
-                            if (pmix_path_is_absolute(app->app)) {
-                                procinfo[p].executable_name = strdup(app->app);
-                            } else {
-                                procinfo[p].executable_name = pmix_os_path(false, app->cwd, app->app, NULL);
-                            }
-                        }
-                        procinfo[p].pid = proct->pid;
-                        procinfo[p].exit_code = proct->exit_code;
-                        procinfo[p].state = prte_pmix_convert_state(proct->state);
-                        ++p;
-                    }
-                }
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_LOCAL_PROC_TABLE, &dry, PMIX_DATA_ARRAY);
-                PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_NUM_PSETS)) {
-                sz = pmix_list_get_size(&prte_pmix_server_globals.psets);
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NUM_PSETS, &sz, PMIX_SIZE);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_PSET_NAMES)) {
-                pmix_server_pset_t *ps;
-                ans = NULL;
-                PMIX_LIST_FOREACH(ps, &prte_pmix_server_globals.psets, pmix_server_pset_t)
-                {
-                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, ps->name);
-                }
-                if (NULL == ans) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                } else {
-                    tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
-                    PMIX_ARGV_FREE_COMPAT(ans);
-                    ans = NULL;
-                    PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_PSET_NAMES, tmp, PMIX_STRING);
-                    free(tmp);
-                    if (PMIX_SUCCESS != rc) {
-                        PMIX_ERROR_LOG(rc);
-                        goto done;
-                    }
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_PSET_MEMBERSHIP)) {
-                pmix_server_pset_t *ps, *psptr;
-                /* must have provided us with a pset name qualifier */
-                if (NULL == psetname) {
-                    ret = PMIX_ERR_BAD_PARAM;
-                    goto done;
-                }
-                ans = NULL;
-                /* find the referenced pset */
-                psptr = NULL;
-                PMIX_LIST_FOREACH(ps, &prte_pmix_server_globals.psets, pmix_server_pset_t) {
-                    if (0 == strcmp(psetname, ps->name)) {
-                        psptr = ps;
-                        break;
-                    }
-                }
-                if (NULL == psptr) {
-                    /* we don't know that pset */
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* define the array that holds the membership - no need to allocate anything */
-                dry.array = psptr->members;
-                dry.type = PMIX_PROC_RANK;
-                dry.size = psptr->num_members;
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_PSET_MEMBERSHIP, &dry, PMIX_DATA_ARRAY);
-                PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_JOB_SIZE)) {
-                jdata = prte_get_job_data_object(jobid);
-                if (NULL == jdata) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* setup the reply */
-                key = jdata->num_procs;
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_JOB_SIZE, &key, PMIX_UINT32);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_NUM_GROUPS)) {
-                sz = pmix_list_get_size(&prte_pmix_server_globals.groups);
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_NUM_GROUPS, &sz, PMIX_SIZE);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_GROUP_NAMES)) {
-                pmix_server_pset_t *ps;
-                ans = NULL;
-                PMIX_LIST_FOREACH(ps, &prte_pmix_server_globals.groups, pmix_server_pset_t)
-                {
-                    PMIX_ARGV_APPEND_NOSIZE_COMPAT(&ans, ps->name);
-                }
-                tmp = PMIX_ARGV_JOIN_COMPAT(ans, ',');
-                PMIX_ARGV_FREE_COMPAT(ans);
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_GROUP_NAMES, tmp, PMIX_STRING);
-                free(tmp);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_GROUP_MEMBERSHIP)) {
-                /* construct a list of values with pmix_proc_t
-                 * entries for each proc in the indicated group */
-                pmix_server_pset_t *ps, *grp = NULL;
-                PMIX_LIST_FOREACH(ps, &prte_pmix_server_globals.groups, pmix_server_pset_t)
-                {
-                    if (PMIX_CHECK_NSPACE(ps->name, jobid)) {
-                        grp = ps;
-                        break;
-                    }
-                }
-                if (NULL == grp) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* Check if there are any entries in the group */
-                if (0 == grp->num_members) {
-                    ret = PMIX_ERR_NOT_FOUND;
-                    goto done;
-                }
-                /* cycle thru the job and create an entry for each proc */
-                PMIX_DATA_ARRAY_CONSTRUCT(&dry, grp->num_members, PMIX_PROC);
-                proc = (pmix_proc_t *) dry.array;
-                memcpy(proc, grp->members, grp->num_members * sizeof(pmix_proc_t));
-                PMIX_INFO_LIST_ADD(rc, results, PMIX_QUERY_GROUP_MEMBERSHIP, &dry, PMIX_DATA_ARRAY);
-                PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-
-#if PMIX_NUMERIC_VERSION >= 0x00050000
-            } else if (0 == strcmp(q->keys[n], PMIX_QUERY_ALLOCATION)) {
-                /* collect all the node info */
-                void *nodelist, *nodeinfolist;
-                char *str;
-                prte_topology_t *topo;
-                int len;
-
-                PMIX_INFO_LIST_START(nodelist);
-                p = 0;
-                for (k=0; k < prte_node_pool->size; k++) {
-                    node = (prte_node_t*)pmix_pointer_array_get_item(prte_node_pool, k);
-                    if (NULL == node) {
-                        continue;
-                    }
-                    PMIX_INFO_LIST_START(nodeinfolist);
-                    /* start with the node name */
-                    PMIX_INFO_LIST_ADD(rc, nodeinfolist, PMIX_HOSTNAME, node->name, PMIX_STRING);
-                    /* add any aliases */
-                    if (NULL != node->aliases) {
-                        str = PMIX_ARGV_JOIN_COMPAT(node->aliases, ',');
-                        PMIX_INFO_LIST_ADD(rc, nodeinfolist, PMIX_HOSTNAME_ALIASES, str, PMIX_STRING);
-                        free(str);
-                    }
-                    /* add topology index */
-                    PMIX_INFO_LIST_ADD(rc, nodeinfolist, PMIX_TOPOLOGY_INDEX, &node->topology->index, PMIX_INT);
-                    /* convert to array */
-                    PMIX_INFO_LIST_CONVERT(rc, nodeinfolist, &dry);
-                    PMIX_INFO_LIST_RELEASE(nodeinfolist);
-                    /* now add the entry to the main list */
-                    PMIX_INFO_LIST_ADD(rc, nodelist, PMIX_NODE_INFO, &dry, PMIX_DATA_ARRAY);
-                    ++p;
-                    PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                }
-                /* add topology info */
-                for (k=0; k < prte_node_topologies->size; k++) {
-                    topo = (prte_topology_t*)pmix_pointer_array_get_item(prte_node_topologies, k);
-                    if (NULL == topo) {
-                        continue;
-                    }
-                    /* convert the topology to XML representation */
-#if HWLOC_API_VERSION < 0x20000
-                    /* get this from the v1.x API */
-                    if (0 != hwloc_topology_export_xmlbuffer(topo->topo, &str, &len)) {
-                        continue;
-                    }
-                    PMIX_INFO_LIST_ADD(rc, nodelist, PMIX_HWLOC_XML_V1, str, PMIX_STRING);
-#else
-                    if (0 != hwloc_topology_export_xmlbuffer(topo->topo, &str, &len, 0)) {
-                        continue;
-                    }
-                    PMIX_INFO_LIST_ADD(rc, nodelist, PMIX_HWLOC_XML_V2, str, PMIX_STRING);
-#endif
-                    free(str);
-                }
-                /* convert list to array */
-                PMIX_INFO_LIST_CONVERT(rc, nodelist, &dry);
-                PMIX_INFO_LIST_RELEASE(nodelist);
-                /* add to results */
-                PMIX_INFO_LIST_ADD(rc, nodelist, PMIX_QUERY_ALLOCATION, &dry, PMIX_DATA_ARRAY);
-                PMIX_DATA_ARRAY_DESTRUCT(&dry);
-                if (PMIX_SUCCESS != rc) {
-                    PMIX_ERROR_LOG(rc);
-                    goto done;
-                }
-#endif
-            } else {
-                fprintf(stderr, "Query for unrecognized attribute: %s\n", q->keys[n]);
-            }
-        } // for
-    }     // for
-
-done:
-    rcd = PMIX_NEW(prte_pmix_server_op_caddy_t);
-    PMIX_INFO_LIST_CONVERT(rc, results, &dry);
-    if (PMIX_SUCCESS != rc) {
-        PMIX_ERROR_LOG(rc);
-        ret = rc;
-    }
-    PMIX_INFO_LIST_RELEASE(results);
-    if (PMIX_SUCCESS == ret) {
-        if (0 == dry.size) {
-            ret = PMIX_ERR_NOT_FOUND;
-        } else {
-            if (dry.size < cd->ninfo) {
-                ret = PMIX_QUERY_PARTIAL_SUCCESS;
-            } else {
-                ret = PMIX_SUCCESS;
-            }
-        }
-    }
-    rcd->ninfo = dry.size;
-    rcd->info = (pmix_info_t*)dry.array;
-    // memory allocated in the data array will be free'd when rcd is released
-    cd->infocbfunc(ret, rcd->info, rcd->ninfo, cd->cbdata, qrel, rcd);
-    PMIX_RELEASE(cd);
-}
-
-pmix_status_t psched_query_fn(pmix_proc_t *proct,
-                              pmix_query_t *queries, size_t nqueries,
-                              pmix_info_cbfunc_t cbfunc, void *cbdata)
-{
-    prte_pmix_server_op_caddy_t *cd;
-
-    if (NULL == queries || NULL == cbfunc) {
-        return PMIX_ERR_BAD_PARAM;
-    }
-
-    /* need to threadshift this request */
-    cd = PMIX_NEW(prte_pmix_server_op_caddy_t);
-    memcpy(&cd->proct, proct, sizeof(pmix_proc_t));
-    cd->queries = queries;
-    cd->nqueries = nqueries;
-    cd->infocbfunc = cbfunc;
-    cd->cbdata = cbdata;
-
-    prte_event_set(prte_event_base, &(cd->ev), -1, PRTE_EV_WRITE, _query, cd);
-    PMIX_POST_OBJECT(cd);
-    prte_event_active(&(cd->ev), PRTE_EV_WRITE, 1);
-
-    return PMIX_SUCCESS;
-}
diff --git a/src/tools/psched/scheduler.c b/src/tools/psched/scheduler.c
deleted file mode 100644
index 8666fdb09a..0000000000
--- a/src/tools/psched/scheduler.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2015-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2018-2019 Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2020      IBM Corporation.  All rights reserved.
- * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "prte_config.h"
-
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <string.h>
-
-#include "src/pmix/pmix-internal.h"
-#include "src/mca/base/pmix_mca_base_var.h"
-
-#include "src/tools/psched/psched.h"
-
-static int sched_base_verbose = -1;
-void psched_scheduler_init(void)
-{
-    pmix_output_stream_t lds;
-
-    pmix_mca_base_var_register("prte", "scheduler", "base", "verbose",
-                               "Verbosity for debugging scheduler operations",
-                               PMIX_MCA_BASE_VAR_TYPE_INT,
-                               &sched_base_verbose);
-    if (0 <= sched_base_verbose) {
-        PMIX_CONSTRUCT(&lds, pmix_output_stream_t);
-        lds.lds_want_stdout = true;
-        psched_globals.scheduler_output = pmix_output_open(&lds);
-        PMIX_DESTRUCT(&lds);
-        pmix_output_set_verbosity(psched_globals.scheduler_output, sched_base_verbose);
-    }
-
-    pmix_output_verbose(2, psched_globals.scheduler_output,
-                        "%s scheduler:psched: initialize",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-    return;
-}
-
-void psched_scheduler_finalize(void)
-{
-    return;
-}
-
-void psched_request_init(int fd, short args, void *cbdata)
-{
-    psched_req_t *req = (psched_req_t*)cbdata;
-    size_t n;
-    pmix_status_t rc, rcerr = PMIX_SUCCESS;
-    bool notwaiting = false;
-    PRTE_HIDE_UNUSED_PARAMS(fd, args);
-
-    pmix_output_verbose(2, psched_globals.output,
-                        "%s scheduler:psched: init request",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    // process the incoming directives
-    for (n=0; n < req->ndata; n++) {
-        if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_REQ_ID)) {
-            req->user_refid = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_ID)) {
-            req->alloc_refid = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_SESSION_ID)) {
-            PMIX_VALUE_GET_NUMBER(rc, &req->data[n].value, req->sessionID, uint32_t);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_ERROR_LOG(rc);
-                // track the first error
-                if (PMIX_SUCCESS == rcerr) {
-                    rcerr = rc;
-                }
-            }
-            // continue processing as we may need some of the info
-            // when reporting back the error
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_NUM_NODES)) {
-            PMIX_VALUE_GET_NUMBER(rc, &req->data[n].value, req->num_nodes, uint64_t);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_ERROR_LOG(rc);
-                // track the first error
-                if (PMIX_SUCCESS == rcerr) {
-                    rcerr = rc;
-                }
-                // continue processing as we may need some of the info
-                // when reporting back the error
-            }
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_NODE_LIST)) {
-            req->nlist = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_EXCLUDE)) {
-            req->exclude = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_NUM_CPUS)) {
-            PMIX_VALUE_GET_NUMBER(rc, &req->data[n].value, req->num_cpus, uint64_t);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_ERROR_LOG(rc);
-                // track the first error
-                if (PMIX_SUCCESS == rcerr) {
-                    rcerr = rc;
-                }
-                // continue processing as we may need some of the info
-                // when reporting back the error
-            }
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_NUM_CPU_LIST)) {
-            req->ncpulist = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_CPU_LIST)) {
-            req->cpulist = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_MEM_SIZE)) {
-            PMIX_VALUE_GET_NUMBER(rc, &req->data[n].value, req->memsize, float);
-            if (PMIX_SUCCESS != rc) {
-                PMIX_ERROR_LOG(rc);
-                // track the first error
-                if (PMIX_SUCCESS == rcerr) {
-                    rcerr = rc;
-                }
-                // continue processing as we may need some of the info
-                // when reporting back the error
-            }
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_TIME)) {
-            req->time = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_QUEUE)) {
-            req->queue = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_PREEMPTIBLE)) {
-            req->preemptible = PMIx_Value_true(&req->data[n].value);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_LEND)) {
-            req->lend = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_IMAGE)) {
-            req->image = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_WAIT_ALL_NODES)) {
-            req->waitall = PMIx_Value_true(&req->data[n].value);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_SHARE)) {
-            req->share = PMIx_Value_true(&req->data[n].value);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_NOSHELL)) {
-            req->noshell = PMIx_Value_true(&req->data[n].value);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_DEPENDENCY)) {
-            req->dependency = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_BEGIN)) {
-            req->begintime = strdup(req->data[n].value.data.string);
-        } else if (PMIX_CHECK_KEY(&req->data[n], PMIX_ALLOC_NOT_WAITING)) {
-            notwaiting = true;
-        }
-    }
-    if (notwaiting) {
-        // we callback with the current status so the requestor
-        // can be told if we are accepting the request
-        if (NULL != req->cbfunc) {
-            req->cbfunc(rcerr, NULL, 0, req->cbdata, NULL, NULL);
-        }
-        if (PMIX_SUCCESS == rcerr) {
-            // continue to next state
-            PRTE_ACTIVATE_SCHED_STATE(req, PSCHED_STATE_QUEUE);
-        } else {
-            PMIX_RELEASE(req);
-        }
-    } else if (PMIX_SUCCESS == rcerr) {
-        // move to next state
-        PRTE_ACTIVATE_SCHED_STATE(req, PSCHED_STATE_QUEUE);
-    } else {
-        // need to reply to requestor so they don't hang
-        if (NULL != req->cbfunc) {
-            req->cbfunc(rcerr, NULL, 0, req->cbdata, NULL, NULL);
-        }
-        // cannot continue processing the request
-        PMIX_RELEASE(req);
-    }
-    return;
-}
-
-
-void psched_request_queue(int fd, short args, void *cbdata)
-{
-    psched_req_t *req = (psched_req_t*)cbdata;
-    PRTE_HIDE_UNUSED_PARAMS(fd, args);
-
-    pmix_output_verbose(2, psched_globals.output,
-                        "%s scheduler:psched: queue request",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    // need to reply to requestor so they don't hang
-    if (NULL != req->cbfunc) {
-        req->cbfunc(PMIX_ERR_NOT_SUPPORTED, NULL, 0, req->cbdata, NULL, NULL);
-    }
-    // cannot continue processing the request
-    PMIX_RELEASE(req);
-
-}
-
-void psched_session_complete(int fd, short args, void *cbdata)
-{
-    psched_req_t *req = (psched_req_t*)cbdata;
-    PRTE_HIDE_UNUSED_PARAMS(fd, args, req);
-
-    pmix_output_verbose(2, psched_globals.output,
-                        "%s scheduler:psched: session complete",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-}
diff --git a/src/tools/psched/schizo.c b/src/tools/psched/schizo.c
deleted file mode 100644
index 612a4331c8..0000000000
--- a/src/tools/psched/schizo.c
+++ /dev/null
@@ -1,326 +0,0 @@
-/*
- * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2021 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-2017 Los Alamos National Security, LLC.
- *                         All rights reserved.
- * Copyright (c) 2009-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2011-2017 Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2017      UT-Battelle, LLC. All rights reserved.
- * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2015      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
- * Copyright (c) 2018-2022 IBM Corporation.  All rights reserved.
- * Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- *
- */
-
-#include "prte_config.h"
-#include "types.h"
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#include <ctype.h>
-#include <getopt.h>
-
-
-#include "src/util/name_fns.h"
-#include "src/util/pmix_argv.h"
-#include "src/util/pmix_basename.h"
-#include "src/util/pmix_os_dirpath.h"
-#include "src/util/pmix_os_path.h"
-#include "src/util/pmix_path.h"
-#include "src/util/pmix_environ.h"
-#include "src/util/prte_cmd_line.h"
-#include "src/util/session_dir.h"
-#include "src/util/pmix_show_help.h"
-
-#include "src/mca/errmgr/errmgr.h"
-#include "src/mca/ess/base/base.h"
-#include "src/mca/prteinstalldirs/prteinstalldirs.h"
-#include "src/mca/rmaps/base/base.h"
-#include "src/mca/state/base/base.h"
-#include "src/runtime/prte_globals.h"
-#include "src/runtime/pmix_init_util.h"
-
-#include "src/mca/schizo/base/base.h"
-#include "src/tools/psched/psched.h"
-
-static int parse_cli(char **argv, pmix_cli_result_t *results, bool silent);
-static int detect_proxy(char *argv);
-static int parse_env(char **srcenv, char ***dstenv, pmix_cli_result_t *cli);
-static void allow_run_as_root(pmix_cli_result_t *results);
-static void job_info(pmix_cli_result_t *results,
-                     void *jobinfo);
-static int set_default_rto(prte_job_t *jdata,
-                           prte_rmaps_options_t *options);
-
-prte_schizo_base_module_t psched_schizo_module = {
-    .name = "psched",
-    .parse_cli = parse_cli,
-    .parse_env = parse_env,
-    .setup_fork = prte_schizo_base_setup_fork,
-    .detect_proxy = detect_proxy,
-    .allow_run_as_root = allow_run_as_root,
-    .job_info = job_info,
-    .set_default_rto = set_default_rto,
-    .check_sanity = prte_schizo_base_sanity
-};
-
-static struct option pschedoptions[] = {
-    /* basic options */
-    PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_HELP, PMIX_ARG_OPTIONAL, 'h'),
-    PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_VERSION, PMIX_ARG_NONE, 'V'),
-    PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_VERBOSE, PMIX_ARG_NONE, 'v'),
-
-    // MCA parameters
-    PMIX_OPTION_DEFINE(PRTE_CLI_PRTEMCA, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE(PRTE_CLI_PMIXMCA, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE(PRTE_CLI_TUNE, PMIX_ARG_REQD),
-
-    // resource options
-    PMIX_OPTION_DEFINE(PRTE_CLI_DEFAULT_HOSTFILE, PMIX_ARG_REQD),
-    PMIX_OPTION_SHORT_DEFINE(PRTE_CLI_HOST, PMIX_ARG_REQD, 'H'),
-    PMIX_OPTION_DEFINE(PRTE_CLI_HOSTFILE, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE("machinefile", PMIX_ARG_REQD),
-
-    // DVM options
-    PMIX_OPTION_DEFINE(PRTE_CLI_RUN_AS_ROOT, PMIX_ARG_NONE),
-    PMIX_OPTION_DEFINE(PRTE_CLI_DAEMONIZE, PMIX_ARG_NONE),
-    PMIX_OPTION_DEFINE(PRTE_CLI_NO_READY_MSG, PMIX_ARG_NONE),
-    PMIX_OPTION_DEFINE(PRTE_CLI_SET_SID, PMIX_ARG_NONE),
-    PMIX_OPTION_DEFINE(PRTE_CLI_TMPDIR, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE(PRTE_CLI_REPORT_PID, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE(PRTE_CLI_REPORT_URI, PMIX_ARG_REQD),
-    PMIX_OPTION_DEFINE(PRTE_CLI_KEEPALIVE, PMIX_ARG_REQD),
-
-    // debug options
-    PMIX_OPTION_DEFINE(PRTE_CLI_DEBUG, PMIX_ARG_NONE),
-
-    PMIX_OPTION_END
-};
-static char *pschedshorts = "h::vVH:";
-
-static int schizo_base_verbose = -1;
-void psched_schizo_init(void)
-{
-    pmix_output_stream_t lds;
-
-    pmix_mca_base_var_register("prte", "schizo", "base", "verbose",
-                               "Verbosity for debugging schizo framework",
-                               PMIX_MCA_BASE_VAR_TYPE_INT,
-                               &schizo_base_verbose);
-    if (0 <= schizo_base_verbose) {
-        PMIX_CONSTRUCT(&lds, pmix_output_stream_t);
-        lds.lds_want_stdout = true;
-        prte_schizo_base_framework.framework_output = pmix_output_open(&lds);
-        PMIX_DESTRUCT(&lds);
-        pmix_output_set_verbosity(prte_schizo_base_framework.framework_output, schizo_base_verbose);
-    }
-
-    pmix_output_verbose(2, prte_schizo_base_framework.framework_output,
-                        "%s schizo:psched: initialize",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-}
-
-static int parse_cli(char **argv, pmix_cli_result_t *results,
-                     bool silent)
-{
-    int rc, n;
-    pmix_cli_item_t *opt;
-    PRTE_HIDE_UNUSED_PARAMS(silent);
-
-    pmix_tool_msg = "Report bugs to: https://github.com/openpmix/prrte";
-    pmix_tool_org = "PRRTE";
-    pmix_tool_version = prte_util_make_version_string("all", PRTE_MAJOR_VERSION, PRTE_MINOR_VERSION,
-                                                      PRTE_RELEASE_VERSION, PRTE_GREEK_VERSION, NULL);
-
-    rc = pmix_cmd_line_parse(argv, pschedshorts, pschedoptions, NULL,
-                             results, "help-psched.txt");
-    if (PMIX_SUCCESS != rc) {
-        if (PMIX_OPERATION_SUCCEEDED == rc) {
-            /* pmix cmd line interpreter output result
-             * successfully - usually means version or
-             * some other stock output was generated */
-            return PRTE_OPERATION_SUCCEEDED;
-        }
-        rc = prte_pmix_convert_status(rc);
-        return rc;
-    }
-
-    // handle relevant MCA params
-    PMIX_LIST_FOREACH(opt, &results->instances, pmix_cli_item_t) {
-        if (0 == strcmp(opt->key, PRTE_CLI_PRTEMCA)) {
-            for (n=0; NULL != opt->values[n]; n++) {
-                prte_schizo_base_expose(opt->values[n], "PRTE_MCA_");
-            }
-        } else if (0 == strcmp(opt->key, PRTE_CLI_PMIXMCA)) {
-            for (n=0; NULL != opt->values[n]; n++) {
-                prte_schizo_base_expose(opt->values[n], "PMIX_MCA_");
-            }
-        }
-    }
-    return PRTE_SUCCESS;
-}
-
-static int parse_env(char **srcenv, char ***dstenv,
-                     pmix_cli_result_t *cli)
-{
-    int i, j, n;
-    char *p1, *p2;
-    char **env;
-    char **xparams = NULL, **xvals = NULL;
-    char *param, *value;
-    pmix_cli_item_t *opt;
-    PRTE_HIDE_UNUSED_PARAMS(srcenv);
-
-    pmix_output_verbose(1, prte_schizo_base_framework.framework_output,
-                        "%s schizo:prte: parse_env",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    if (NULL == cli) {
-        return PRTE_SUCCESS;
-    }
-
-    env = *dstenv;
-
-    /* look for -x options - not allowed to conflict with a -mca option */
-    opt = pmix_cmd_line_get_param(cli, PRTE_CLI_FWD_ENVAR);
-    if (NULL != opt) {
-        for (j=0; NULL != opt->values[j]; j++) {
-            /* the value is the envar */
-            p1 = opt->values[j];
-            /* if there is an '=' in it, then they are setting a value */
-            if (NULL != (p2 = strchr(p1, '='))) {
-                *p2 = '\0';
-                ++p2;
-            } else {
-                p2 = getenv(p1);
-                if (NULL == p2) {
-                    pmix_show_help("help-schizo-base.txt", "missing-envar-param", true, p1);
-                    continue;
-                }
-            }
-
-            /* check if it is already present in the environment */
-            for (n = 0; NULL != env && NULL != env[n]; n++) {
-                param = strdup(env[n]);
-                value = strchr(param, '=');
-                *value = '\0';
-                value++;
-                /* check if parameter is already present */
-                if (0 == strcmp(param, p1)) {
-                    /* we do have it - check for same value */
-                    if (0 != strcmp(value, p2)) {
-                        /* this is an error - different values */
-                        pmix_show_help("help-schizo-base.txt", "duplicate-mca-value", true, p1, p2,
-                                       value);
-                        free(param);
-                        PMIX_ARGV_FREE_COMPAT(xparams);
-                        PMIX_ARGV_FREE_COMPAT(xvals);
-                        return PRTE_ERR_BAD_PARAM;
-                    }
-                }
-                free(param);
-            }
-
-            /* check if we already processed a conflicting -x version with MCA prefix */
-            if (NULL != xparams) {
-                for (i = 0; NULL != xparams[i]; i++) {
-                    if (0 == strncmp("PRTE_MCA_", p1, strlen("PRTE_MCA_"))) {
-                        /* this is an error - different values */
-                        pmix_show_help("help-schizo-base.txt", "duplicate-mca-value", true, p1, p2,
-                                       xvals[i]);
-                        PMIX_ARGV_FREE_COMPAT(xparams);
-                        PMIX_ARGV_FREE_COMPAT(xvals);
-                        return PRTE_ERR_BAD_PARAM;
-                    }
-                }
-            }
-
-            /* cache this for later inclusion - do not modify dstenv in this loop */
-            PMIX_ARGV_APPEND_NOSIZE_COMPAT(&xparams, p1);
-            PMIX_ARGV_APPEND_NOSIZE_COMPAT(&xvals, p2);
-        }
-    }
-
-    /* add the -x values */
-    if (NULL != xparams) {
-        for (i = 0; NULL != xparams[i]; i++) {
-            PMIX_SETENV_COMPAT(xparams[i], xvals[i], true, dstenv);
-        }
-        PMIX_ARGV_FREE_COMPAT(xparams);
-        PMIX_ARGV_FREE_COMPAT(xvals);
-    }
-
-    return PRTE_SUCCESS;
-}
-
-static int detect_proxy(char *personalities)
-{
-    pmix_output_verbose(2, prte_schizo_base_framework.framework_output,
-                        "%s[%s]: detect proxy with %s (%s)",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), __FILE__,
-                        (NULL == personalities) ? "NULL" : personalities,
-                        prte_tool_basename);
-
-    if (NULL != personalities) {
-        /* this is a list of personalities we need to check -
-         * if it contains "psched", then we are available
-         * to be used */
-        if (NULL != strstr(personalities, "psched")) {
-            return 100;
-        }
-        return 0;
-    }
-
-    /* not us */
-    return -1;
-}
-
-static void allow_run_as_root(pmix_cli_result_t *cli)
-{
-    char *r1, *r2;
-
-    if (pmix_cmd_line_is_taken(cli, "allow-run-as-root")) {
-        prte_allow_run_as_root = true;
-        return;
-    }
-
-    if (NULL != (r1 = getenv("PRTE_ALLOW_RUN_AS_ROOT"))
-        && NULL != (r2 = getenv("PRTE_ALLOW_RUN_AS_ROOT_CONFIRM"))) {
-        if (0 == strcmp(r1, "1") && 0 == strcmp(r2, "1")) {
-            prte_allow_run_as_root = true;
-            return;
-        }
-    }
-
-    prte_schizo_base_root_error_msg();
-}
-
-static void job_info(pmix_cli_result_t *results,
-                     void *jobinfo)
-{
-    PRTE_HIDE_UNUSED_PARAMS(results, jobinfo);
-    return;
-}
-
-static int set_default_rto(prte_job_t *jdata,
-                           prte_rmaps_options_t *options)
-{
-    PRTE_HIDE_UNUSED_PARAMS(options);
-    return prte_state_base_set_runtime_options(jdata, NULL);
-}
diff --git a/src/tools/psched/server.c b/src/tools/psched/server.c
deleted file mode 100644
index 6d085d4ee7..0000000000
--- a/src/tools/psched/server.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/*
- * Copyright (c) 2004-2010 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2011 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-2013 Los Alamos National Security, LLC.
- *                         All rights reserved.
- * Copyright (c) 2009-2020 Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2011      Oak Ridge National Labs.  All rights reserved.
- * Copyright (c) 2013-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2014-2017 Mellanox Technologies, Inc.
- *                         All rights reserved.
- * Copyright (c) 2014-2019 Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2021-2024 Nanook Consulting.  All rights reserved.
- * Copyright (c) 2023      Triad National Security, LLC. All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- *
- */
-
-#include "prte_config.h"
-#include "types.h"
-
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
-#ifdef HAVE_SYS_TYPES_H
-#    include <sys/types.h>
-#endif
-#include <fcntl.h>
-#ifdef HAVE_NETINET_IN_H
-#    include <netinet/in.h>
-#endif
-#ifdef HAVE_ARPA_INET_H
-#    include <arpa/inet.h>
-#endif
-#ifdef HAVE_NETDB_H
-#    include <netdb.h>
-#endif
-#include <ctype.h>
-
-#include "prte_stdint.h"
-#include "src/class/pmix_hotel.h"
-#include "src/class/pmix_list.h"
-#include "src/mca/base/pmix_mca_base_var.h"
-#include "src/pmix/pmix-internal.h"
-#include "src/util/pmix_argv.h"
-#include "src/util/error.h"
-#include "src/util/pmix_os_dirpath.h"
-#include "src/util/pmix_os_path.h"
-#include "src/util/pmix_output.h"
-#include "src/util/pmix_printf.h"
-#include "src/util/pmix_environ.h"
-#include "src/util/pmix_show_help.h"
-
-#include "src/mca/errmgr/errmgr.h"
-#include "src/mca/grpcomm/grpcomm.h"
-#include "src/mca/schizo/base/base.h"
-#include "src/prted/pmix/pmix_server_internal.h"
-#include "src/rml/rml_contact.h"
-#include "src/rml/rml.h"
-#include "src/runtime/prte_data_server.h"
-#include "src/runtime/prte_globals.h"
-#include "src/threads/pmix_threads.h"
-#include "src/util/name_fns.h"
-#include "src/util/proc_info.h"
-#include "src/util/prte_cmd_line.h"
-#include "src/util/session_dir.h"
-#include "src/util/pmix_show_help.h"
-
-#include "src/tools/psched/psched.h"
-
-static pmix_topology_t mytopology = {0};
-
-static pmix_server_module_t psched_server = {
-    .register_events = psched_register_events_fn,
-    .deregister_events = psched_deregister_events_fn,
-    .notify_event = psched_notify_event,
-    .query = psched_query_fn,
-    .tool_connected = psched_tool_connected_fn,
-    .job_control = psched_job_ctrl_fn,
-    .allocate = psched_alloc_fn,
-#if PMIX_NUMERIC_VERSION >= 0x00050000
-    .session_control = psched_session_ctrl_fn
-#endif
-};
-
-psched_globals_t psched_globals = {
-    .initialized = false,
-    .requests = PMIX_POINTER_ARRAY_STATIC_INIT,
-    .tools = PMIX_LIST_STATIC_INIT,
-    .syscontroller = PMIX_PROC_STATIC_INIT,
-    .controller_connected = false,
-    .verbosity = -1,
-    .output = -1
-};
-
-typedef struct {
-    char *function;
-    char **attrs;
-} prte_regattr_input_t;
-
-static prte_regattr_input_t prte_attributes[] = {
-    {.function = "PMIx_Query_info",
-     .attrs = (char *[]){"PMIX_QUERY_NAMESPACES",
-                         "PMIX_QUERY_NAMESPACE_INFO",
-                         "PMIX_QUERY_SPAWN_SUPPORT",
-                         "PMIX_QUERY_DEBUG_SUPPORT",
-                         "PMIX_HWLOC_XML_V1",
-                         "PMIX_HWLOC_XML_V2",
-                         "PMIX_PROC_URI",
-                         "PMIX_QUERY_PROC_TABLE",
-                         "PMIX_QUERY_LOCAL_PROC_TABLE",
-                         "PMIX_QUERY_NUM_PSETS",
-                         "PMIX_QUERY_PSET_NAMES",
-                         "PMIX_JOB_SIZE",
-                         "PMIX_QUERY_NUM_GROUPS",
-                         "PMIX_QUERY_GROUP_NAMES",
-                         "PMIX_QUERY_GROUP_MEMBERSHIP",
-                         NULL}},
-    {.function = "PMIx_Query_info_nb",
-     .attrs = (char *[]){"PMIX_QUERY_NAMESPACES",
-                         "PMIX_QUERY_NAMESPACE_INFO",
-                         "PMIX_QUERY_SPAWN_SUPPORT",
-                         "PMIX_QUERY_DEBUG_SUPPORT",
-                         "PMIX_HWLOC_XML_V1",
-                         "PMIX_HWLOC_XML_V2",
-                         "PMIX_PROC_URI",
-                         "PMIX_QUERY_PROC_TABLE",
-                         "PMIX_QUERY_LOCAL_PROC_TABLE",
-                         "PMIX_QUERY_NUM_PSETS",
-                         "PMIX_QUERY_PSET_NAMES",
-                         "PMIX_JOB_SIZE",
-                         "PMIX_QUERY_NUM_GROUPS",
-                         "PMIX_QUERY_GROUP_NAMES",
-                         "PMIX_QUERY_GROUP_MEMBERSHIP",
-                         "PMIX_QUERY_ALLOCATION",
-                         "PMIX_QUERY_ALLOC_STATUS",
-                         NULL}},
-    {.function = "PMIx_Log", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Log_nb", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Job_control",
-     .attrs = (char *[]){"PMIX_JOB_CTRL_KILL",
-                         "PMIX_JOB_CTRL_TERMINATE",
-                         "PMIX_JOB_CTRL_SIGNAL",
-                         NULL}},
-    {.function = "PMIx_Job_control_nb",
-     .attrs = (char *[]){"PMIX_JOB_CTRL_KILL",
-                         "PMIX_JOB_CTRL_TERMINATE",
-                         "PMIX_JOB_CTRL_SIGNAL",
-                         NULL}},
-    {.function = "PMIx_Group_construct",
-     .attrs = (char *[]){"PMIX_GROUP_ASSIGN_CONTEXT_ID",
-                         "PMIX_EMBED_BARRIER",
-                         "PMIX_GROUP_ENDPT_DATA",
-                         NULL}},
-    {.function = "PMIx_Group_construct_nb",
-     .attrs = (char *[]){"PMIX_GROUP_ASSIGN_CONTEXT_ID",
-                         "PMIX_EMBED_BARRIER",
-                         "PMIX_GROUP_ENDPT_DATA",
-                         NULL}},
-    {.function = "PMIx_Group_invite", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Group_invite_nb", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Group_join", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Group_join_nb", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Group_leave", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Group_leave_nb", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Group_destruct", .attrs = (char *[]){"PMIX_EMBED_BARRIER", NULL}},
-    {.function = "PMIx_Group_destruct_nb", .attrs = (char *[]){"PMIX_EMBED_BARRIER", NULL}},
-    {.function = "PMIx_Register_event_handler", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Deregister_event_handler", .attrs = (char *[]){"N/A", NULL}},
-    {.function = "PMIx_Notify_event", .attrs = (char *[]){"NONE", NULL}},
-    {.function = "PMIx_Allocate_resources",
-     .attrs = (char *[]){"PMIX_ALLOC_REQ_ID",
-                         "PMIX_ALLOC_NUM_NODES",
-                         "PMIX_ALLOC_NODE_LIST",
-                         "PMIX_ALLOC_NUM_CPUS",
-                         "PMIX_ALLOC_NUM_CPU_LIST",
-                         "PMIX_ALLOC_CPU_LIST",
-                         "PMIX_ALLOC_MEM_SIZE",
-                         "PMIX_ALLOC_TIME",
-                         "PMIX_ALLOC_QUEUE",
-                         "PMIX_ALLOC_PREEMPTIBLE",
-                         NULL}},
-#if PMIX_NUMERIC_VERSION >= 0x00050000
-    {.function = "PMIx_Session_control",
-     .attrs = (char *[]){"PMIX_SESSION_CTRL_ID",
-                         "PMIX_SESSION_APP",
-                         "PMIX_SESSION_PAUSE",
-                         "PMIX_SESSION_RESUME",
-                         "PMIX_SESSION_TERMINATE",
-                         "PMIX_SESSION_PREEMPT",
-                         "PMIX_SESSION_RESTORE",
-                         "PMIX_SESSION_SIGNAL",
-                         "PMIX_SESSION_COMPLETE",
-                         NULL}},
-#endif
-    {.function = ""},
-};
-
-static int gen_verbose = -1;
-
-void psched_register_params(void)
-{
-    bool opened = false;
-
-    /* register a verbosity */
-    psched_globals.verbosity = -1;
-    (void) pmix_mca_base_var_register("prte", "psched", NULL, "verbose",
-                                      "Debug verbosity for PRRTE Scheduler",
-                                      PMIX_MCA_BASE_VAR_TYPE_INT,
-                                      &psched_globals.verbosity);
-    if (0 < psched_globals.verbosity) {
-        psched_globals.output = pmix_output_open(NULL);
-        pmix_output_set_verbosity(psched_globals.output,
-                                  psched_globals.verbosity);
-        prte_pmix_server_globals.output = pmix_output_open(NULL);
-        pmix_output_set_verbosity(prte_pmix_server_globals.output,
-                                  psched_globals.verbosity);
-        opened = true;
-    }
-
-    /* register the general verbosity */
-    (void) pmix_mca_base_var_register("prte", "pmix", NULL, "server_verbose",
-                                      "Debug verbosity for PMIx server",
-                                      PMIX_MCA_BASE_VAR_TYPE_INT,
-                                      &gen_verbose);
-    if (0 < gen_verbose && psched_globals.verbosity < gen_verbose) {
-        if (!opened) {
-            psched_globals.output = pmix_output_open(NULL);
-            prte_pmix_server_globals.output = pmix_output_open(NULL);
-        }
-        pmix_output_set_verbosity(psched_globals.output, gen_verbose);
-        pmix_output_set_verbosity(prte_pmix_server_globals.output, gen_verbose);
-        psched_globals.verbosity = gen_verbose;
-    }
-}
-
-/* provide a callback function for lost connections to allow us
- * to cleanup after any tools once they depart */
-static void lost_connection_hdlr(size_t evhdlr_registration_id, pmix_status_t status,
-                                 const pmix_proc_t *source, pmix_info_t info[], size_t ninfo,
-                                 pmix_info_t *results, size_t nresults,
-                                 pmix_event_notification_cbfunc_fn_t cbfunc, void *cbdata)
-{
-    prte_pmix_tool_t *tl;
-    PRTE_HIDE_UNUSED_PARAMS(evhdlr_registration_id, status,
-                            info, ninfo, results, nresults);
-
-    /* scan the list of attached tools to see if this one is there */
-    PMIX_LIST_FOREACH(tl, &psched_globals.tools, prte_pmix_tool_t)
-    {
-        if (PMIX_CHECK_PROCID(&tl->name, source)) {
-            /* take this tool off the list */
-            pmix_list_remove_item(&psched_globals.tools, &tl->super);
-            /* release it */
-            PMIX_RELEASE(tl);
-            break;
-        }
-    }
-
-    /* we _always_ have to execute the evhandler callback or
-     * else the event progress engine will hang */
-    if (NULL != cbfunc) {
-        cbfunc(PMIX_EVENT_ACTION_COMPLETE, NULL, 0, NULL, NULL, cbdata);
-    }
-}
-
-static void regcbfunc(pmix_status_t status, size_t ref, void *cbdata)
-{
-    prte_pmix_lock_t *lock = (prte_pmix_lock_t *) cbdata;
-    PRTE_HIDE_UNUSED_PARAMS(ref);
-
-    PMIX_ACQUIRE_OBJECT(lock);
-    lock->status = status;
-    PRTE_PMIX_WAKEUP_THREAD(lock);
-}
-
-/*
- * Initialize global variables used w/in the server.
- */
-int psched_server_init(pmix_cli_result_t *results)
-{
-    int rc;
-    void *ilist;
-    pmix_data_array_t darray;
-    pmix_info_t *info, myinf;
-    size_t n, ninfo;
-    char *tmp;
-    pmix_status_t prc;
-    prte_pmix_lock_t lock;
-    pmix_proc_t myproc;
-    PRTE_HIDE_UNUSED_PARAMS(results);
-
-    if (psched_globals.initialized) {
-        return PRTE_SUCCESS;
-    }
-    psched_globals.initialized = true;
-
-    /* setup the server's global variables */
-    PMIX_CONSTRUCT(&psched_globals.requests, pmix_pointer_array_t);
-    pmix_pointer_array_init(&psched_globals.requests, 128, INT_MAX, 2);
-    PMIX_CONSTRUCT(&psched_globals.tools, pmix_list_t);
-    psched_globals.syscontroller = *PRTE_NAME_INVALID;
-
-    pmix_output_verbose(2, prte_pmix_server_globals.output,
-                        "%s server:psched: initialize",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    PMIX_INFO_LIST_START(ilist);
-
-#ifdef PMIX_SERVER_SCHEDULER
-    /* tell the server that we are the scheduler */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SCHEDULER,
-                       NULL, PMIX_BOOL);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-#endif
-
-    /* tell the server our name so we agree on our identifier */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_TOOL_NSPACE,
-                       prte_process_info.myproc.nspace, PMIX_STRING);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_TOOL_RANK,
-                       &prte_process_info.myproc.rank, PMIX_PROC_RANK);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    /* tell the server our hostname so we agree on it */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_HOSTNAME,
-                       prte_process_info.nodename, PMIX_STRING);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    // check for aliases
-    if (NULL != prte_process_info.aliases) {
-        tmp = PMIX_ARGV_JOIN_COMPAT(prte_process_info.aliases, ',');
-        PMIX_INFO_LIST_ADD(prc, ilist, PMIX_HOSTNAME_ALIASES,
-                           tmp, PMIX_STRING);
-        free(tmp);
-        if (PMIX_SUCCESS != prc) {
-            PMIX_INFO_LIST_RELEASE(ilist);
-            rc = prte_pmix_convert_status(prc);
-            return rc;
-        }
-    }
-
-    /* tell the server what we are doing with FQDN */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_HOSTNAME_KEEP_FQDN,
-                       &prte_keep_fqdn_hostnames, PMIX_BOOL);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-#ifdef PMIX_EXTERNAL_AUX_EVENT_BASE
-    /* give the server our event base to use for signal trapping */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_EXTERNAL_AUX_EVENT_BASE,
-                       prte_event_base, PMIX_POINTER);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-#endif
-
-    // pass our topology object down to the server library for its use
-    mytopology.source = "hwloc";
-    mytopology.topology = prte_hwloc_topology;
-    PMIX_INFO_CONSTRUCT(&myinf);
-    PMIX_LOAD_KEY(myinf.key, PMIX_TOPOLOGY2);
-    myinf.value.type = PMIX_TOPO;
-    myinf.value.data.topo = &mytopology;
-    PMIX_INFO_LIST_INSERT(prc, ilist, &myinf);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    /* tell the server our temp directory */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_TMPDIR,
-                       prte_process_info.top_session_dir,
-                       PMIX_STRING);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    /* if requested, tell the server library to output our PMIx URI */
-    if (NULL != prte_pmix_server_globals.report_uri) {
-        PMIX_INFO_LIST_ADD(prc, ilist, PMIX_TCP_REPORT_URI,
-                           prte_pmix_server_globals.report_uri, PMIX_STRING);
-        if (PMIX_SUCCESS != prc) {
-            PMIX_INFO_LIST_RELEASE(ilist);
-            rc = prte_pmix_convert_status(prc);
-            return rc;
-        }
-    }
-
-    if (NULL != prte_progress_thread_cpus) {
-        PMIX_INFO_LIST_ADD(prc, ilist, PMIX_BIND_PROGRESS_THREAD,
-                           prte_progress_thread_cpus, PMIX_STRING);
-        PMIX_INFO_LIST_ADD(prc, ilist, PMIX_BIND_REQUIRED,
-                           &prte_bind_progress_thread_reqd, PMIX_BOOL);
-    }
-
-    /* schedulers always allow remote tool connections */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_REMOTE_CONNECTIONS,
-                       NULL, PMIX_BOOL);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    /* if the system controller is present, connect to it */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_CONNECT_TO_SYS_CONTROLLER,
-                       NULL, PMIX_BOOL);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    /* don't require the connection else we will abort
-     * if the system controller isn't found */
-    PMIX_INFO_LIST_ADD(prc, ilist, PMIX_TOOL_CONNECT_OPTIONAL,
-                       NULL, PMIX_BOOL);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    /* convert to an info array */
-    PMIX_INFO_LIST_CONVERT(prc, ilist, &darray);
-    if (PMIX_SUCCESS != prc) {
-        PMIX_INFO_LIST_RELEASE(ilist);
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-    PMIX_INFO_LIST_RELEASE(ilist);
-    info = (pmix_info_t*)darray.array;
-    ninfo = darray.size;
-
-    /* initialize as a tool */
-    prc = PMIx_tool_init(&myproc, info, ninfo);
-    if (PMIX_SUCCESS != prc) {
-        /* pmix will provide a nice show_help output here */
-        PMIX_INFO_FREE(info, ninfo);
-        return prte_pmix_convert_status(prc);
-    }
-    PMIX_INFO_FREE(info, ninfo);
-    rc = PRTE_SUCCESS;
-
-    /* register our attributes */
-    for (n = 0; 0 != strlen(prte_attributes[n].function); n++) {
-        prc = PMIx_Register_attributes(prte_attributes[n].function, prte_attributes[n].attrs);
-        if (PMIX_SUCCESS != prc) {
-            return prte_pmix_convert_status(prc);
-        }
-    }
-
-    /* register the "lost-connection" event handler */
-    PRTE_PMIX_CONSTRUCT_LOCK(&lock);
-    prc = PMIX_ERR_LOST_CONNECTION;
-    PMIx_Register_event_handler(&prc, 1, NULL, 0, lost_connection_hdlr, regcbfunc, &lock);
-    PRTE_PMIX_WAIT_THREAD(&lock);
-    rc = prte_pmix_convert_status(lock.status);
-    PRTE_PMIX_DESTRUCT_LOCK(&lock);
-    if (PRTE_SUCCESS != rc) {
-        return rc;
-    }
-
-    /* register our server function module */
-    prc = PMIx_tool_set_server_module(&psched_server);
-    if (PMIX_SUCCESS != prc) {
-        rc = prte_pmix_convert_status(prc);
-        return rc;
-    }
-
-    return PRTE_SUCCESS;
-}
-
-void psched_server_finalize(void)
-{
-    pmix_status_t prc;
-
-    if (!psched_globals.initialized) {
-        return;
-    }
-
-    pmix_output_verbose(2, psched_globals.output,
-                        "%s Finalizing PMIX server",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    prc = PMIx_tool_finalize();
-    if (PMIX_SUCCESS != prc) {
-        PMIX_ERROR_LOG(prc);
-    }
-}
diff --git a/src/tools/psched/session.c b/src/tools/psched/session.c
deleted file mode 100644
index f6e9ff8ca9..0000000000
--- a/src/tools/psched/session.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2022-2023 Nanook Consulting.  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "prte_config.h"
-
-#include "src/pmix/pmix-internal.h"
-#include "src/prted/pmix/pmix_server_internal.h"
-#include "src/rml/rml.h"
-
-#include "src/tools/psched/psched.h"
-
-pmix_status_t psched_alloc_fn(const pmix_proc_t *client,
-                              pmix_alloc_directive_t directive,
-                              const pmix_info_t data[], size_t ndata,
-                              pmix_info_cbfunc_t cbfunc, void *cbdata)
-{
-    psched_req_t *req;
-
-    pmix_output_verbose(2, psched_globals.output,
-                        "%s allocate upcalled on behalf of proc %s:%u with %" PRIsize_t " infos",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), client->nspace, client->rank, ndata);
-
-    req = PMIX_NEW(psched_req_t);
-    PMIX_LOAD_PROCID(&req->requestor, client->nspace, client->rank);
-    req->directive = directive;
-    req->data = (pmix_info_t *) data;
-    req->ndata = ndata;
-    req->cbfunc = cbfunc;
-    req->cbdata = cbdata;
-    PRTE_ACTIVATE_SCHED_STATE(req, PSCHED_STATE_INIT);
-    return PRTE_SUCCESS;
-}
-
-#if PMIX_NUMERIC_VERSION >= 0x00050000
-
-pmix_status_t psched_session_ctrl_fn(const pmix_proc_t *requestor,
-                                     uint32_t sessionID,
-                                     const pmix_info_t directives[], size_t ndirs,
-                                     pmix_info_cbfunc_t cbfunc, void *cbdata)
-{
-    psched_req_t *req;
-
-
-    pmix_output_verbose(2, psched_globals.output,
-                        "%s session ctrl upcalled on behalf of proc %s:%u with %" PRIsize_t " directives",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME), requestor->nspace, requestor->rank, ndirs);
-
-    req = PMIX_NEW(psched_req_t);
-    PMIX_LOAD_PROCID(&req->requestor, requestor->nspace, requestor->rank);
-    req->sessionID = sessionID;
-    req->data = (pmix_info_t *) directives;
-    req->ndata = ndirs;
-    req->cbfunc = cbfunc;
-    req->cbdata = cbdata;
-    PRTE_ACTIVATE_SCHED_STATE(req, PSCHED_STATE_SESSION_COMPLETE);
-    return PRTE_SUCCESS;
-}
-
-#endif
diff --git a/src/tools/psched/state.c b/src/tools/psched/state.c
deleted file mode 100644
index 766ba56bfb..0000000000
--- a/src/tools/psched/state.c
+++ /dev/null
@@ -1,380 +0,0 @@
-/*
- * Copyright (c) 2015-2020 Intel, Inc.  All rights reserved.
- * Copyright (c) 2018-2019 Research Organization for Information Science
- *                         and Technology (RIST).  All rights reserved.
- * Copyright (c) 2020      IBM Corporation.  All rights reserved.
- * Copyright (c) 2020      Cisco Systems, Inc.  All rights reserved
- * Copyright (c) 2021-2024 Nanook Consulting  All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "prte_config.h"
-
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif /* HAVE_UNISTD_H */
-#include <string.h>
-
-#include "src/pmix/pmix-internal.h"
-#include "src/util/pmix_argv.h"
-#include "src/util/pmix_output.h"
-
-#include "src/mca/errmgr/errmgr.h"
-#include "src/mca/ras/base/base.h"
-#include "src/runtime/prte_quit.h"
-
-#include "src/mca/state/base/base.h"
-#include "psched.h"
-
-/* global variables */
-pmix_list_t prte_psched_states = PMIX_LIST_STATIC_INIT;
-
-/*
- * Module functions: Global
- */
-static int init(void);
-static int finalize(void);
-
-/* local functions */
-static void alloc_complete(int fd, short args, void *cbata);
-
-/* define job state machine sequence - only required to
- * allow integration to main PRRTE code for detecting
- * base allocation */
-static prte_job_state_t launch_states[] = {
-    PRTE_JOB_STATE_ALLOCATE,
-    PRTE_JOB_STATE_ALLOCATION_COMPLETE
-};
-
-static prte_state_cbfunc_t launch_callbacks[] = {
-    prte_ras_base_allocate,
-    alloc_complete
-};
-
-/* define scheduler state machine sequence for walking
- * thru an allocation lifecycle */
-static prte_sched_state_t sched_states[] = {
-    PSCHED_STATE_INIT,
-    PSCHED_STATE_QUEUE,
-    PSCHED_STATE_SESSION_COMPLETE
-};
-
-static prte_state_cbfunc_t sched_callbacks[] = {
-    psched_request_init,
-    psched_request_queue,
-    psched_session_complete
-};
-
-
-static void force_quit(int fd, short args, void *cbdata)
-{
-    PRTE_HIDE_UNUSED_PARAMS(fd, args);
-    prte_state_caddy_t *caddy = (prte_state_caddy_t *) cbdata;
-
-    prte_event_base_active = false;
-    PMIX_RELEASE(caddy);
-}
-
-static int add_psched_state(prte_sched_state_t state,
-                            prte_state_cbfunc_t cbfunc);
-static void psched_print_state_machine(void);
-
-prte_state_base_module_t psched_state_module = {
-    .init = init,
-    .finalize = finalize,
-    .activate_job_state = prte_state_base_activate_job_state,
-    .add_job_state = prte_state_base_add_job_state,
-    .set_job_state_callback = prte_state_base_set_job_state_callback,
-    .remove_job_state = prte_state_base_remove_job_state,
-    .activate_proc_state = prte_state_base_activate_proc_state,
-    .add_proc_state = prte_state_base_add_proc_state,
-    .set_proc_state_callback = prte_state_base_set_proc_state_callback,
-    .remove_proc_state = prte_state_base_remove_proc_state
-};
-
-static int state_base_verbose = -1;
-void psched_state_init(void)
-{
-    pmix_output_stream_t lds;
-
-    pmix_mca_base_var_register("prte", "state", "base", "verbose",
-                               "Verbosity for debugging state machine",
-                               PMIX_MCA_BASE_VAR_TYPE_INT,
-                               &state_base_verbose);
-    if (0 <= state_base_verbose) {
-        PMIX_CONSTRUCT(&lds, pmix_output_stream_t);
-        lds.lds_want_stdout = true;
-        prte_state_base_framework.framework_output = pmix_output_open(&lds);
-        PMIX_DESTRUCT(&lds);
-        pmix_output_set_verbosity(prte_state_base_framework.framework_output, state_base_verbose);
-    }
-
-    prte_state = psched_state_module;
-    psched_state_module.init();
-}
-
-/************************
- * API Definitions
- ************************/
-static int init(void)
-{
-    int i, rc;
-    int num_states;
-
-    pmix_output_verbose(2, prte_state_base_framework.framework_output,
-                        "%s state:psched: initialize",
-                        PRTE_NAME_PRINT(PRTE_PROC_MY_NAME));
-
-    /* setup the state machines */
-    PMIX_CONSTRUCT(&prte_job_states, pmix_list_t);
-    PMIX_CONSTRUCT(&prte_proc_states, pmix_list_t);
-    PMIX_CONSTRUCT(&prte_psched_states, pmix_list_t);
-
-    /* setup the job state machine */
-    num_states = sizeof(launch_states) / sizeof(prte_job_state_t);
-    for (i = 0; i < num_states; i++) {
-        if (PRTE_SUCCESS
-            != (rc = prte_state.add_job_state(launch_states[i], launch_callbacks[i]))) {
-            PRTE_ERROR_LOG(rc);
-        }
-    }
-    /* add the termination response */
-    rc = prte_state.add_job_state(PRTE_JOB_STATE_DAEMONS_TERMINATED, prte_quit);
-    if (PRTE_SUCCESS != rc) {
-        PRTE_ERROR_LOG(rc);
-    }
-    /* add a default error response */
-    rc = prte_state.add_job_state(PRTE_JOB_STATE_FORCED_EXIT, force_quit);
-    if (PRTE_SUCCESS != rc) {
-        PRTE_ERROR_LOG(rc);
-    }
-    /* add callback to report progress, if requested */
-    rc = prte_state.add_job_state(PRTE_JOB_STATE_REPORT_PROGRESS,
-                                  prte_state_base_report_progress);
-    if (PRTE_SUCCESS != rc) {
-        PRTE_ERROR_LOG(rc);
-    }
-    if (5 < pmix_output_get_verbosity(prte_state_base_framework.framework_output)) {
-        prte_state_base_print_job_state_machine();
-    }
-
-    /* setup the scheduler state machine */
-    num_states = sizeof(sched_states) / sizeof(prte_sched_state_t);
-    for (i = 0; i < num_states; i++) {
-        rc = add_psched_state(sched_states[i], sched_callbacks[i]);
-        if (PRTE_SUCCESS != rc) {
-            PRTE_ERROR_LOG(rc);
-        }
-    }
-    if (4 < pmix_output_get_verbosity(psched_globals.output)) {
-        psched_print_state_machine();
-    }
-
-    return PRTE_SUCCESS;
-}
-
-static int finalize(void)
-{
-    /* cleanup the state machines */
-    PMIX_LIST_DESTRUCT(&prte_proc_states);
-    PMIX_LIST_DESTRUCT(&prte_job_states);
-    PMIX_LIST_DESTRUCT(&prte_psched_states);
-
-    return PRTE_SUCCESS;
-}
-
-static void alloc_complete(int fd, short args, void *cbdata)
-{
-    prte_state_caddy_t *caddy = (prte_state_caddy_t *) cbdata;
-    PRTE_HIDE_UNUSED_PARAMS(fd, args);
-
-    PMIX_RELEASE(caddy);
-}
-
-void psched_activate_sched_state(psched_req_t *req, prte_sched_state_t state)
-{
-    psched_state_t *s, *any = NULL, *error = NULL;
-
-    /* check for uniqueness */
-    PMIX_LIST_FOREACH(s, &prte_psched_states, psched_state_t) {
-        if (s->sched_state == PSCHED_STATE_ANY) {
-            /* save this place */
-            any = s;
-        }
-        if (s->sched_state == PSCHED_STATE_ERROR) {
-            error = s;
-        }
-        if (s->sched_state == state) {
-            PRTE_REACHING_SCHED_STATE(req, state);
-            if (NULL == s->cbfunc) {
-                pmix_output_verbose(1, psched_globals.output,
-                                    "%s NULL CBFUNC FOR SCHED %s STATE %s",
-                                    PRTE_NAME_PRINT(PRTE_PROC_MY_NAME),
-                                    (NULL == req->user_refid) ? "N/A" : req->user_refid,
-                                    prte_sched_state_to_str(state));
-                return;
-            }
-            PSCHED_THREADSHIFT(req, s->cbfunc);
-            return;
-        }
-    }
-    /* if we get here, then the state wasn't found, so execute
-     * the default handler if it is defined
-     */
-    if (PSCHED_STATE_ERROR < state && NULL != error) {
-        s = (psched_state_t *) error;
-    } else if (NULL != any) {
-        s = (psched_state_t *) any;
-    } else {
-        pmix_output_verbose(1, psched_globals.output,
-                            "ACTIVATE: SCHED STATE %s NOT REGISTERED",
-                            prte_sched_state_to_str(state));
-        return;
-    }
-    if (NULL == s->cbfunc) {
-        pmix_output_verbose(1, psched_globals.output,
-                            "ACTIVATE: ANY STATE HANDLER NOT DEFINED");
-        return;
-    }
-    PRTE_REACHING_SCHED_STATE(req, state);
-    PSCHED_THREADSHIFT(req, s->cbfunc);
-}
-
-static int add_psched_state(prte_sched_state_t state,
-                            prte_state_cbfunc_t cbfunc)
-{
-    psched_state_t *st;
-
-    /* check for uniqueness */
-    PMIX_LIST_FOREACH(st, &prte_psched_states, psched_state_t) {
-        if (st->sched_state == state) {
-            pmix_output_verbose(1, psched_globals.output,
-                                "DUPLICATE STATE DEFINED: %s", prte_sched_state_to_str(state));
-            return PRTE_ERR_BAD_PARAM;
-        }
-    }
-
-    st = PMIX_NEW(psched_state_t);
-    st->sched_state = state;
-    st->cbfunc = cbfunc;
-    pmix_list_append(&prte_psched_states, &(st->super));
-
-    return PRTE_SUCCESS;
-}
-
-const char* prte_sched_state_to_str(prte_sched_state_t s)
-{
-    switch (s) {
-        case PSCHED_STATE_UNDEF:
-            return "UNDEFINED";
-        case PSCHED_STATE_INIT:
-            return "INIT";
-        case PSCHED_STATE_QUEUE:
-            return "QUEUE";
-        case PSCHED_STATE_SESSION_COMPLETE:
-            return "SESSION COMPLETE";
-        default:
-            return "UNKNOWN";
-    }
-}
-
-static void psched_print_state_machine(void)
-{
-    psched_state_t *st;
-
-    pmix_output(0, "SCHEDULER STATE MACHINE:");
-    PMIX_LIST_FOREACH (st, &prte_psched_states, psched_state_t) {
-        pmix_output(0, "\tState: %s cbfunc: %s",
-                    prte_sched_state_to_str(st->sched_state),
-                    (NULL == st->cbfunc) ? "NULL" : "DEFINED");
-    }
-}
-
-
-static void state_con(psched_state_t *p)
-{
-    p->sched_state = PSCHED_STATE_UNDEF;
-    p->cbfunc = NULL;
-}
-PMIX_CLASS_INSTANCE(psched_state_t,
-                    pmix_list_item_t,
-                    state_con, NULL);
-
-static void req_con(psched_req_t *p)
-{
-    PMIx_Load_procid(&p->requestor, NULL, PMIX_RANK_INVALID);
-    p->copy = false;  // data is not a local copy
-    p->data = NULL;
-    p->ndata = 0;
-    p->user_refid = NULL;
-    p->alloc_refid = NULL;
-    p->num_nodes = 0;
-    p->nlist = NULL;
-    p->exclude = NULL;
-    p->num_cpus = 0;
-    p->ncpulist = NULL;
-    p->cpulist = NULL;
-    p->memsize = 0.0;
-    p->time = NULL;
-    p->queue = NULL;
-    p->preemptible = false;
-    p->lend = NULL;
-    p->image = NULL;
-    p->waitall = false;
-    p->share = false;
-    p->noshell = false;
-    p->dependency = NULL;
-    p->begintime = NULL;
-    p->state = PSCHED_STATE_UNDEF;
-    p->sessionID = UINT32_MAX;
-}
-static void req_des(psched_req_t *p)
-{
-    if (NULL != p->data && p->copy) {
-        PMIx_Info_free(p->data, p->ndata);
-    }
-    if (NULL != p->user_refid) {
-        free(p->user_refid);
-    }
-    if (NULL != p->alloc_refid) {
-        free(p->alloc_refid);
-    }
-    if (NULL != p->nlist) {
-        free(p->nlist);
-    }
-    if (NULL != p->exclude) {
-        free(p->exclude);
-    }
-    if (NULL != p->ncpulist) {
-        free(p->ncpulist);
-    }
-    if (NULL != p->cpulist) {
-        free(p->cpulist);
-    }
-    if (NULL != p->time) {
-        free(p->time);
-    }
-    if (NULL != p->queue) {
-        free(p->queue);
-    }
-    if (NULL != p->lend) {
-        free(p->lend);
-    }
-    if (NULL != p->image) {
-        free(p->image);
-    }
-    if (NULL != p->dependency) {
-        free(p->dependency);
-    }
-    if (NULL != p->begintime) {
-        free(p->begintime);
-    }
-}
-PMIX_CLASS_INSTANCE(psched_req_t,
-                    pmix_list_item_t,
-                    req_con, req_des);