diff --git a/doc/source/conf.py b/doc/source/conf.py
index bc8454a..7f1ef13 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -130,12 +130,7 @@ html_title = 'OpenStack Governance'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
-html_last_updated_fmt = os.popen(git_cmd).read()
+# html_static_path = ['_static']
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 9dbc011..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
diff --git a/setup.cfg b/setup.cfg
index ca9abe6..a6614a5 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -7,11 +7,3 @@ description-file =
 author = OpenStack Foundation
 author-email = openstack@lists.openstack.org
 home-page = http://www.openstack.org/
-
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-
-[pbr]
-warnerrors = True
diff --git a/tox.ini b/tox.ini
index d16e0f4..921b78b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,8 +4,8 @@ minversion = 1.6
 skipsdist = True
 
 [testenv]
+basepython = python3
 usedevelop = True
-install_command = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
 
@@ -13,4 +13,4 @@ deps = -r{toxinidir}/test-requirements.txt
 commands = {posargs}
 
 [testenv:docs]
-commands = python setup.py build_sphinx
+commands = sphinx-build -W -b html doc/source doc/build/html