diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7835d1ba..119373f3 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -23,7 +23,6 @@
 # serve to show the default.
 
 import openstackdocstheme
-import pbr.version
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -69,11 +68,6 @@ role_name = 'os_keystone'
 target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Documentation: ' + role_name + ' role'
 
-# The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = (
-    "https://opendev.org/openstack/{}".format(target_name)
-)
-
 # References variable for substitutions
 current_series = openstackdocstheme.ext._get_series_name()
 deploy_guide_prefix = "https://docs.openstack.org/project-deploy-guide/openstack-ansible/{}/%s".format(current_series)
@@ -81,17 +75,6 @@ deploy_guide_prefix = "https://docs.openstack.org/project-deploy-guide/openstack
 # Format: Reference name: (string containing %s for substitution, linkname)
 extlinks = {'deploy_guide': (deploy_guide_prefix, '')}
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version_info = pbr.version.VersionInfo(target_name)
-# The full version, including alpha/beta/rc tags.
-release = version_info.version_string_with_vcs()
-# The short X.Y version.
-version = version_info.canonical_version_string()
-
 # openstackdocstheme options
 repository_name = 'openstack/' + target_name
 bug_project = project.lower()
@@ -181,10 +164,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index 19eb9a9e..8e7b2b96 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -62,11 +62,6 @@ role_name = 'os_keystone'
 target_name = 'openstack-ansible-' + role_name
 title = 'OpenStack-Ansible Release Notes: ' + role_name + 'role'
 
-# The link to the browsable source code (for the left hand menu)
-oslosphinx_cgit_link = (
-    "https://opendev.org/openstack/{}".format(target_name)
-)
-
 # Release notes do not need a version number in the title, they
 # cover multiple releases.
 # The full version, including alpha/beta/rc tags.
@@ -158,10 +153,6 @@ html_static_path = ['_static']
 # directly to the root of the documentation.
 # html_extra_path = []
 
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-html_last_updated_fmt = '%Y-%m-%d %H:%M'
-
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
 # html_use_smartypants = True
diff --git a/setup.cfg b/setup.cfg
index 754c4f11..4d5ba416 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,14 +11,3 @@ classifier =
     Intended Audience :: System Administrators
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
-[pbr]
-warnerrors = True
-
-[wheel]
-universal = 1
diff --git a/setup.py b/setup.py
index 566d8443..cd35c3c3 100644
--- a/setup.py
+++ b/setup.py
@@ -13,17 +13,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
-# In python < 2.7.4, a lazy loading of package `pbr` will break
-# setuptools if some other modules registered functions in `atexit`.
-# solution from: http://bugs.python.org/issue15881#msg170215
-try:
-    import multiprocessing  # noqa
-except ImportError:
-    pass
-
 setuptools.setup(
     setup_requires=['pbr>=2.0.0'],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index f6e02d8a..05cdbebd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -37,7 +37,7 @@ deps = -r{toxinidir}/doc/requirements.txt
 commands =
     bash -c "rm -rf doc/build"
     doc8 doc
-    sphinx-build --keep-going -b html doc/source doc/build/html
+    sphinx-build -W --keep-going -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
 deps = {[testenv:docs]deps}