diff --git a/doc/requirements.txt b/doc/requirements.txt
index e56ff4c804..79e3ded4f6 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -19,11 +19,8 @@ python-ironic-inspector-client>=1.5.0 # Apache-2.0
 python-magnumclient>=2.3.0 # Apache-2.0
 python-manilaclient>=2.0.0 # Apache-2.0
 python-mistralclient!=3.2.0,>=3.1.0 # Apache-2.0
-python-muranoclient>=0.8.2 # Apache-2.0
 python-neutronclient>=6.7.0 # Apache-2.0
 python-octaviaclient>=1.11.0 # Apache-2.0
-python-saharaclient>=1.4.0 # Apache-2.0
-python-senlinclient>=1.1.0 # Apache-2.0
 python-troveclient>=3.1.0 # Apache-2.0
 python-watcherclient>=2.5.0 # Apache-2.0
 python-zaqarclient>=1.0.0 # Apache-2.0
diff --git a/doc/source/cli/commands.rst b/doc/source/cli/commands.rst
index 4f3aad313b..653e2a50bd 100644
--- a/doc/source/cli/commands.rst
+++ b/doc/source/cli/commands.rst
@@ -191,17 +191,6 @@ conflicts when creating new plugins. For a complete list check out
 * ``appcontainer service``: (**Application Container (Zun)**)
 * ``baremetal``: (**Baremetal (Ironic)**)
 * ``claim``: (**Messaging (Zaqar)**)
-* ``cluster``: (**Clustering (Senlin)**)
-* ``cluster action``: (**Clustering (Senlin)**)
-* ``cluster event``: (**Clustering (Senlin)**)
-* ``cluster members``: (**Clustering (Senlin)**)
-* ``cluster node``: (**Clustering (Senlin)**)
-* ``cluster policy``: (**Clustering (Senlin)**)
-* ``cluster policy binding``: (**Clustering (Senlin)**)
-* ``cluster policy type``: (**Clustering (Senlin)**)
-* ``cluster profile``: (**Clustering (Senlin)**)
-* ``cluster profile type``: (**Clustering (Senlin)**)
-* ``cluster receiver``: (**Clustering (Senlin)**)
 * ``coe ca``: (**Container Orchestration Engine (Magnum)**)
 * ``coe cluster``: (**Container Orchestration Engine (Magnum)**)
 * ``coe cluster template``: (**Container Orchestration Engine (Magnum)**)
@@ -210,10 +199,6 @@ conflicts when creating new plugins. For a complete list check out
 * ``coe stats``: (**Container Orchestration Engine (Magnum)**)
 * ``cron trigger``: (**Workflow Engine (Mistral)**)
 * ``database flavor``: (**Database (Trove)**)
-* ``dataprocessing data source``: (**Data Processing (Sahara)**)
-* ``dataprocessing image``: (**Data Processing (Sahara)**)
-* ``dataprocessing image tags``: (**Data Processing (Sahara)**)
-* ``dataprocessing plugin``: (**Data Processing (Sahara)**)
 * ``loadbalancer``: (**Load Balancer (Octavia)**)
 * ``loadbalancer healthmonitor``: (**Load Balancer (Octavia)**)
 * ``loadbalancer l7policy``: (**Load Balancer (Octavia)**)
diff --git a/doc/source/cli/plugin-commands/index.rst b/doc/source/cli/plugin-commands/index.rst
index 340a8d4dac..ac61cc0e01 100644
--- a/doc/source/cli/plugin-commands/index.rst
+++ b/doc/source/cli/plugin-commands/index.rst
@@ -21,8 +21,6 @@ Plugin Commands
    neutron
    octavia
    placement
-   sahara
-   senlin
    trove
    watcher
    zaqar
@@ -34,8 +32,3 @@ Plugin Commands
 .. # cueclient is not in global-requirements
 .. # list-plugins:: openstack.mb.v1
 .. #   :detailed:
-
-.. murano
-.. # the murano docs cause warnings and a broken docs build
-.. # .. list-plugins:: openstack.application_catalog.v1
-.. #   :detailed:
diff --git a/doc/source/cli/plugin-commands/sahara.rst b/doc/source/cli/plugin-commands/sahara.rst
deleted file mode 100644
index 7c51756a3a..0000000000
--- a/doc/source/cli/plugin-commands/sahara.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-sahara
-------
-
-.. autoprogram-cliff:: openstack.data_processing.v1
diff --git a/doc/source/cli/plugin-commands/senlin.rst b/doc/source/cli/plugin-commands/senlin.rst
deleted file mode 100644
index 90929058f8..0000000000
--- a/doc/source/cli/plugin-commands/senlin.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-senlin
-------
-
-.. autoprogram-cliff:: openstack.clustering.v1
diff --git a/doc/source/contributor/plugins.rst b/doc/source/contributor/plugins.rst
index f94ad1e292..beebb03107 100644
--- a/doc/source/contributor/plugins.rst
+++ b/doc/source/contributor/plugins.rst
@@ -34,11 +34,8 @@ The following is a list of projects that are an OpenStackClient plugin.
 - python-magnumclient
 - python-manilaclient
 - python-mistralclient
-- python-muranoclient
 - python-neutronclient\*\*
 - python-octaviaclient
-- python-saharaclient
-- python-senlinclient
 - python-troveclient
 - python-watcherclient
 - python-zaqarclient
@@ -49,7 +46,6 @@ The following is a list of projects that are an OpenStackClient plugin.
 The following is a list of projects that are not an OpenStackClient plugin.
 
 - python-monascaclient
-- python-solumclient
 
 Implementation
 ==============