diff --git a/doc/src/Commands_all.rst b/doc/src/Commands_all.rst
index 8995ffdcc4..41af6846e0 100644
--- a/doc/src/Commands_all.rst
+++ b/doc/src/Commands_all.rst
@@ -68,7 +68,6 @@ An alphabetic list of all general LAMMPS commands.
    * :doc:`log <log>`
    * :doc:`mass <mass>`
    * :doc:`mdi/engine <mdi_engine>`
-   * :doc:`message <message>`
    * :doc:`minimize <minimize>`
    * :doc:`min_modify <min_modify>`
    * :doc:`min_style <min_style>`
@@ -105,7 +104,6 @@ An alphabetic list of all general LAMMPS commands.
    * :doc:`restart <restart>`
    * :doc:`run <run>`
    * :doc:`run_style <run_style>`
-   * :doc:`server <server>`
    * :doc:`set <set>`
    * :doc:`shell <shell>`
    * :doc:`special_bonds <special_bonds>`
diff --git a/doc/src/Commands_fix.rst b/doc/src/Commands_fix.rst
index 2dfa6e3fdb..7f01adff72 100644
--- a/doc/src/Commands_fix.rst
+++ b/doc/src/Commands_fix.rst
@@ -51,7 +51,6 @@ OPT.
    * :doc:`bond/swap <fix_bond_swap>`
    * :doc:`box/relax <fix_box_relax>`
    * :doc:`charge/regulation <fix_charge_regulation>`
-   * :doc:`client/md <fix_client_md>`
    * :doc:`cmap <fix_cmap>`
    * :doc:`colvars <fix_colvars>`
    * :doc:`controller <fix_controller>`
diff --git a/doc/src/Howto_couple.rst b/doc/src/Howto_couple.rst
index 31cafd1f94..81faac56ce 100644
--- a/doc/src/Howto_couple.rst
+++ b/doc/src/Howto_couple.rst
@@ -59,5 +59,4 @@ context of your application.
 .. spacer
 
 4. Couple LAMMPS with another code in a client/server mode.  This is
-   described on the :doc:`Howto client/server <Howto_client_server>` doc
-   page.
+   described on the :doc:`Howto MDI library coupling <Howto_mdi>` page.
diff --git a/doc/src/Howto_mdi.rst b/doc/src/Howto_mdi.rst
index 12c4cfa527..4f014920bb 100644
--- a/doc/src/Howto_mdi.rst
+++ b/doc/src/Howto_mdi.rst
@@ -1,11 +1,6 @@
 Using LAMMPS with the MDI library for code coupling
 ===================================================
 
-.. note::
-
-  This Howto page will eventually replace the
-  :doc:`Howto client/server <Howto_client_server>` doc page.
-
 Client/server coupling of two codes is where one code is the "client"
 and sends request messages (data) to a "server" code.  The server
 responds to each request with a reply message.  This enables the two
diff --git a/doc/src/commands_list.rst b/doc/src/commands_list.rst
index a9b99c6c67..c99f415605 100644
--- a/doc/src/commands_list.rst
+++ b/doc/src/commands_list.rst
@@ -60,7 +60,6 @@ Commands
    log
    mass
    mdi_engine
-   message
    min_modify
    min_spin
    min_style