diff --git a/doc/requirements.txt b/doc/requirements.txt
index 7de287e3..6912fc36 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -3,5 +3,4 @@
 # process, which may cause wedges in the gate later.
 openstackdocstheme>=1.27.1 # Apache-2.0
 doc8>=0.6.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7'  # BSD
-sphinx!=1.6.6,!=1.6.7,>=1.6.2;python_version>='3.4'  # BSD
+sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
diff --git a/setup.cfg b/setup.cfg
index 4d8a0ae2..5b08bea3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -11,11 +11,3 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Topic :: Documentation
-
-[build_sphinx]
-warning-is-error = 1
-build-dir = build
-source-dir = source
-
-[bdist_wheel]
-universal = 1
diff --git a/setup.py b/setup.py
index 73637574..c0a24eab 100644
--- a/setup.py
+++ b/setup.py
@@ -14,17 +14,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'],
     pbr=True)
diff --git a/tox.ini b/tox.ini
index 01a49e10..2aeb5444 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,6 @@ envlist = docs
 [testenv]
 basepython = python3
 setenv = VIRTUAL_ENV={envdir}
-passenv = *_proxy *_PROXY ZUUL_*
 
 [testenv:docs]
 deps =