diff --git a/setup.cfg b/setup.cfg
index 82f42ecd..74936256 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,6 +14,8 @@ classifier =
     License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
+    Programming Language :: Python :: Implementation :: CPython
+    Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
@@ -22,10 +24,6 @@ classifier =
 packages =
     neutron_dynamic_routing
 
-[global]
-setup-hooks =
-    pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
     neutron-bgp-dragent = neutron_dynamic_routing.cmd.eventlet.agents.bgp_dragent:main
@@ -40,12 +38,6 @@ neutron.policies =
 neutron.service_plugins =
     bgp = neutron_dynamic_routing.services.bgp.bgp_plugin:BgpPlugin
 
-[build_sphinx]
-all-files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
 [extract_messages]
 keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
@@ -59,6 +51,3 @@ domain = neutron_dynamic_routing
 domain = neutron_dynamic_routing
 output_dir = neutron_dynamic_routing/locale
 input_file = neutron_dynamic_routing/locale/neutron_dynamic_routing.pot
-
-[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/test-requirements.txt b/test-requirements.txt
index 69303237..1a87d66b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -8,7 +8,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 flake8-import-order==0.12 # LGPLv3
 mock>=2.0.0 # BSD
 python-subunit>=1.0.0 # Apache-2.0/BSD
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.5 # BSD
 sphinxcontrib-svg2pdfconverter>=0.1.0 # BSD
 openstackdocstheme>=1.18.1 # Apache-2.0
 oslo.concurrency>=3.26.0 # Apache-2.0