diff --git a/setup.cfg b/setup.cfg
index 89d65f4d9..14a16e31b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,8 @@ description-file =
     README.rst
 author = OpenStack
 author-email = openstack-discuss@lists.openstack.org
-home-page = https://github.com/openstack/monasca-api
+home-page = https://docs.openstack.org/monasca-api/latest/
+python-requires = >=3.6
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -14,6 +15,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.6
     Programming Language :: Python :: 3.7
 
@@ -28,8 +31,7 @@ data_files =
 
 [extras]
 influxdb =
-  influxdb>=2.9.2,!=5.2.0,!=5.2.1,!=5.2.2,!=5.2.3;python_version<'3.0' # MIT
-  influxdb>=2.9.2;python_version>='3.0' # MIT
+  influxdb>=2.9.2 # MIT
 cassandra =
   cassandra-driver!=3.6.0,>=3.3.0 # Apache-2.0
 
@@ -48,30 +50,11 @@ oslo.config.opts =
 oslo.policy.policies =
     monasca_api = monasca_api.policies:list_rules
 
-[build_sphinx]
-all_files = 1
-build-dir = doc/build
-source-dir = doc/source
-warning-is-error = 1
-
-[build_apiref]
-all_files = 1
-build-dir = api-ref/build
-source-dir = api-ref/source
-
-[build_releasenotes]
-all_files = 1
-build-dir = releasenotes/build
-source-dir = releasenotes/source
-
 [egg_info]
 tag_build =
 tag_date = 0
 tag_svn_revision = 0
 
-[wheel]
-universal = 1
-
 [pbr]
 autodoc_index_modules = True
 autodoc_exclude_modules =
@@ -80,3 +63,9 @@ autodoc_exclude_modules =
   monasca_api.tests.*
   monasca_tempest_tests.*
 api_doc_dir = contributor/api
+
+[build_sphinx]
+all_files = 1
+build-dir = doc/build
+source-dir = doc/source
+warning-is-error = 1
diff --git a/setup.py b/setup.py
index 566d84432..cd35c3c35 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 fc449c2bf..f4da7c58e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -10,7 +10,7 @@ coverage!=4.4,>=4.0 # Apache-2.0
 cassandra-driver!=3.6.0,>=3.3.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
 httplib2>=0.9.1 # MIT
-influxdb>=2.9.2;python_version>='3.0' # MIT
+influxdb>=2.9.2 # MIT
 mock>=2.0.0 # BSD
 oslotest>=3.2.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
@@ -25,7 +25,7 @@ tempest>=17.1.0 # Apache-2.0
 
 # documentation
 doc8>=0.6.0 # Apache-2.0
-sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD
+sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
 os-api-ref>=1.4.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 openstackdocstheme>=1.20.0 # Apache-2.0