diff --git a/distributedcloud/dcdbsync/common/messaging.py b/distributedcloud/dcdbsync/common/messaging.py
index 7a2382863..bbf039a93 100644
--- a/distributedcloud/dcdbsync/common/messaging.py
+++ b/distributedcloud/dcdbsync/common/messaging.py
@@ -26,12 +26,6 @@ from dcdbsync.common import context
 TRANSPORT = None
 NOTIFIER = None
 
-_ALIASES = {
-    'dcdbsync.openstack.common.rpc.impl_kombu': 'rabbit',
-    'dcdbsync.openstack.common.rpc.impl_qpid': 'qpid',
-    'dcdbsync.openstack.common.rpc.impl_zmq': 'zmq',
-}
-
 
 class RequestContextSerializer(oslo_messaging.Serializer):
     def __init__(self, base):
@@ -76,7 +70,7 @@ def setup(url=None, optional=False):
         exmods = ['dcdbsync.common.exception']
         try:
             TRANSPORT = oslo_messaging.get_transport(
-                cfg.CONF, url, allowed_remote_exmods=exmods, aliases=_ALIASES)
+                cfg.CONF, url, allowed_remote_exmods=exmods)
         except oslo_messaging.InvalidTransportURL as e:
             TRANSPORT = None
             if not optional or e.url:
diff --git a/distributedcloud/requirements.txt b/distributedcloud/requirements.txt
index 48e36ac89..db7dd5347 100644
--- a/distributedcloud/requirements.txt
+++ b/distributedcloud/requirements.txt
@@ -11,7 +11,7 @@ Paste # MIT
 PasteDeploy>=1.5.0 # MIT
 Routes>=2.3.1 # MIT
 debtcollector>=1.2.0 # Apache-2.0
-eventlet!=0.18.3,<0.21.0,>=0.18.2 # MIT
+eventlet
 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
 greenlet>=0.3.2 # MIT
 httplib2>=0.7.5 # MIT
diff --git a/distributedcloud/test-requirements.txt b/distributedcloud/test-requirements.txt
index 4a3d15625..216f21e41 100644
--- a/distributedcloud/test-requirements.txt
+++ b/distributedcloud/test-requirements.txt
@@ -8,7 +8,7 @@ fixtures>=3.0.0 # Apache-2.0/BSD
 mock>=2.0 # BSD
 python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=1.1 # Apache-2.0
-sphinx!=1.6.1,>=1.5.1 # BSD
+sphinx # BSD
 oslosphinx>=4.7.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT
diff --git a/distributedcloud/tox.ini b/distributedcloud/tox.ini
index 7bd5c7eaa..1ea5aab3d 100644
--- a/distributedcloud/tox.ini
+++ b/distributedcloud/tox.ini
@@ -18,8 +18,7 @@ cgtsclient_src_dir = ../../config/sysinv/cgts-client/cgts-client
 cgcs_patch_src_dir = ../../update/cgcs-patch/cgcs-patch
 
 [testenv]
-install_command = pip install --use-deprecated legacy-resolver -v -v -v \
-    -c ./upper-constraints.txt \
+install_command = pip install -v -v -v \
     -c https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt \
     {opts} {packages}
 setenv =
@@ -41,7 +40,6 @@ whitelist_externals =
 [testenv:py27]
 basepython = python2.7
 install_command = pip install -v -v -v \
-    -c ./upper-constraints.txt \
     -c https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt \
     {opts} {packages}
 deps = -r{toxinidir}/test-requirements.txt
@@ -90,7 +88,6 @@ commands = oslo_debug_helper {posargs}
 basepython = python3
 deps = hacking>=1.1.0,<=2.0.0
        pycodestyle>=2.0.0
-       flake8-bugbear
 commands = flake8
 
 [testenv:venv]
@@ -172,15 +169,8 @@ show-source = True
 # E402 module level import not at top of file
 # E501 line too long
 # E731 do not assign a lambda expression, use a def
-# -B- codes are bugbear errors
-# B005 Using .strip() with multi-character strings is misleading the reader.
-# B006 Do not use mutable data structures for argument defaults.
-# B007 Loop control variable not used within the loop body.
-# B009 Do not call getattr with a constant attribute value,
-# B306 `BaseException.message` has been deprecated as of Python 2.6 and is removed in Python 3
 ignore = W503,W504,W605,
-         E117,E123,E125,E305,E402,E501,E731,
-         B005,B006,B007,B009,B306
+         E117,E123,E125,E305,E402,E501,E731
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
 
diff --git a/distributedcloud/upper-constraints.txt b/distributedcloud/upper-constraints.txt
deleted file mode 100644
index e74681b7e..000000000
--- a/distributedcloud/upper-constraints.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-# oslo.messaging locked to pike version
-# https://bugs.launchpad.net/starlingx/+bug/1865054
-oslo.messaging==5.30.6 # Apache-2.0
-Pygments==2.5.2
-
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 5f5e43775..aaf3f7603 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,8 +1,8 @@
-sphinx>=2.0.0,!=2.1.0 # BSD
-openstackdocstheme>=2.2.1 # Apache-2.0
+sphinx # BSD
+openstackdocstheme # Apache-2.0
 
 # Release Notes documentation
-reno>=3.1.0 # Apache-2.0
+reno # Apache-2.0
 
 # Api Ref documentation
 os-api-ref>=1.4.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index f4aa24ce3..0ffd6fdb0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ minversion = 2.3
 skipsdist = True
 
 [testenv]
-install_command = pip install --use-deprecated legacy-resolver -v -v -v \
+install_command = pip install -v -v -v \
     -c https://opendev.org/openstack/requirements/raw/branch/stable/stein/upper-constraints.txt \
     {opts} {packages}
 setenv =