diff --git a/doc/source/configuration/settings.rst b/doc/source/configuration/settings.rst
index 4eed11804b..edf8c037cd 100644
--- a/doc/source/configuration/settings.rst
+++ b/doc/source/configuration/settings.rst
@@ -2232,30 +2232,6 @@ Ignore all listed Nova extensions, and behave as if they were unsupported.
 Can be used to selectively disable certain costly extensions for performance
 reasons.
 
-Sahara
-------
-
-.. warning::
-
-  The Sahara dashboard was removed from Horizon during the Newton cycle,
-  and any settings here should be considered legacy. For more up to date
-  information, see the `Sahara Dashboard repo
-  <https://github.com/openstack/sahara-dashboard>`_
-
-SAHARA_AUTO_IP_ALLOCATION_ENABLED
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. versionadded:: 2014.2(Juno)
-
-.. deprecated:: 10.0.0(Newton)
-
-Default:  ``False``
-
-This setting notifies the Data Processing (Sahara) system whether or not
-automatic IP allocation is enabled.  You would want to set this to ``True``
-if you were running Nova Networking with ``auto_assign_floating_ip`` set to
-``True``.
-
 Swift
 -----
 
@@ -2271,42 +2247,6 @@ from Swift. Do not make it very large (higher than several dozens of Megabytes,
 exact number depends on your connection speed), otherwise you may encounter
 socket timeout. The default value is 524288 bytes (or 512 Kilobytes).
 
-Trove
------
-
-.. warning::
-
-  The Trove dashboard was removed from Horizon during the Newton cycle,
-  and any settings here should be considered legacy. For more up to date
-  information, see the `Trove Dashboard repo
-  <https://github.com/openstack/trove-dashboard>`_
-
-TROVE_ADD_DATABASE_PERMS
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. versionadded:: 2013.2(Havana)
-
-.. deprecated:: 10.0.0(Newton)
-
-Default: ``[]``
-
-Trove database extension support. By default, support for creating databases on
-database instances is turned on. To disable this extensions set the permission
-to something unusable such as ``[!]``.
-
-TROVE_ADD_USER_PERMS
-~~~~~~~~~~~~~~~~~~~~
-
-.. versionadded:: 2013.2(Havana)
-
-.. deprecated:: 10.0.0(Newton)
-
-Default: ``[]``
-
-Trove users extension support. By default, support for creating users on
-database instances is turned on. To disable this extensions set the permission
-to something unusable such as ``[!]``.
-
 Django Settings
 ===============
 
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
index 00526b4851..8abf1417e0 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -515,16 +515,6 @@ TIME_ZONE = "UTC"
 #    'network': 'neutron_policy.json',
 #}
 
-# TODO: (david-lyle) remove when plugins support adding settings.
-# Note: Only used when trove-dashboard plugin is configured to be used by
-# Horizon.
-# Trove user and database extension support. By default support for
-# creating users and databases on database instances is turned on.
-# To disable these extensions set the permission here to something
-# unusable such as ["!"].
-#TROVE_ADD_USER_PERMS = []
-#TROVE_ADD_DATABASE_PERMS = []
-
 # Change this patch to the appropriate list of tuples containing
 # a key, label and static directory containing two files:
 # _variables.scss and _styles.scss
@@ -793,17 +783,6 @@ SECURITY_GROUP_RULES = {
 # See Metadata Definitions on:
 # https://docs.openstack.org/glance/latest/user/glancemetadefcatalogapi.html
 
-# TODO: (david-lyle) remove when plugins support settings natively
-# Note: This is only used when the Sahara plugin is configured and enabled
-# for use in Horizon.
-# Indicate to the Sahara data processing service whether or not
-# automatic floating IP allocation is in effect.  If it is not
-# in effect, the user will be prompted to choose a floating IP
-# pool for use in their cluster.  False by default.  You would want
-# to set this to True if you were running Nova Networking with
-# auto_assign_floating_ip = True.
-#SAHARA_AUTO_IP_ALLOCATION_ENABLED = False
-
 # The hash algorithm to use for authentication tokens. This must
 # match the hash algorithm that the identity server and the
 # auth_token middleware are using. Allowed values are the