diff --git a/lms/envs/common.py b/lms/envs/common.py
index 6c806b9199af787d22552b33d7e4c07f30241aa5..9c5ebdc7816d7e91b8441755f79ff95db058d0d9 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -3440,7 +3440,6 @@ JWT_AUTH = {
     ],
     'JWT_AUTH_COOKIE_HEADER_PAYLOAD': 'edx-jwt-cookie-header-payload',
     'JWT_AUTH_COOKIE_SIGNATURE': 'edx-jwt-cookie-signature',
-    'JWT_AUTH_REFRESH_COOKIE': 'edx-jwt-refresh-cookie',
 }
 
 EDX_DRF_EXTENSIONS = {
diff --git a/openedx/core/djangoapps/oauth_dispatch/toggles.py b/openedx/core/djangoapps/oauth_dispatch/toggles.py
index a97d5708fe18c4b6073bb7e2408e5da3f0f30c11..94814ac4933cedc205583526bf96706803d18055 100644
--- a/openedx/core/djangoapps/oauth_dispatch/toggles.py
+++ b/openedx/core/djangoapps/oauth_dispatch/toggles.py
@@ -4,10 +4,9 @@ Feature toggle code for oauth_dispatch.
 
 from __future__ import absolute_import
 
-from edx_rest_framework_extensions.config import SWITCH_ENFORCE_JWT_SCOPES
+from edx_rest_framework_extensions.config import OAUTH_TOGGLE_NAMESPACE, SWITCH_ENFORCE_JWT_SCOPES
 
 from openedx.core.djangoapps.waffle_utils import WaffleSwitch, WaffleSwitchNamespace
 
-WAFFLE_NAMESPACE = 'oauth2'
-OAUTH2_SWITCHES = WaffleSwitchNamespace(name=WAFFLE_NAMESPACE)
-ENFORCE_JWT_SCOPES = WaffleSwitch(OAUTH2_SWITCHES, SWITCH_ENFORCE_JWT_SCOPES)
+
+ENFORCE_JWT_SCOPES = WaffleSwitch(WaffleSwitchNamespace(name=OAUTH_TOGGLE_NAMESPACE), SWITCH_ENFORCE_JWT_SCOPES)
diff --git a/requirements/constraints.txt b/requirements/constraints.txt
index dcba47360ff203a78363d325dad8833328362420..96e1dab3f1993b1751b8a3c3ad4a124335e430f1 100644
--- a/requirements/constraints.txt
+++ b/requirements/constraints.txt
@@ -77,12 +77,6 @@ numpy<1.17.0
 #  jsondiff==1.2.0 (from -r requirements/edx/base.txt (line 146))
 jsondiff==1.1.1
 
-
-# Constraining this because when we rolled it to edx.org production
-# we had a lot of memory issues and gunicorn workers started running
-# out of memory.  ARCH-1210
-edx-drf-extensions==2.4.0
-
 # Constraining this since the newer versions require Python 3
 more-itertools==5.0.0
 
diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt
index d2c6c5c427e8111fa80ad07c66c30be43538ac30..5d1eaa056cfcddd2fa150a91295f05cf45a729d8 100644
--- a/requirements/edx/base.txt
+++ b/requirements/edx/base.txt
@@ -104,7 +104,7 @@ edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.2
 edx-django-sites-extensions==2.3.1
 edx-django-utils==2.0.2
-edx-drf-extensions==2.4.0
+edx-drf-extensions==2.4.5
 edx-enterprise==2.0.17
 edx-i18n-tools==0.4.8
 edx-milestones==0.2.5
diff --git a/requirements/edx/development.txt b/requirements/edx/development.txt
index ec4375acbe354c7293636fc6a4f03c566def6d6a..bbd4bd9c3e1ff89ef0786a42cf281da4ec60ded1 100644
--- a/requirements/edx/development.txt
+++ b/requirements/edx/development.txt
@@ -126,7 +126,7 @@ edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.2
 edx-django-sites-extensions==2.3.1
 edx-django-utils==2.0.2
-edx-drf-extensions==2.4.0
+edx-drf-extensions==2.4.5
 edx-enterprise==2.0.17
 edx-i18n-tools==0.4.8
 edx-lint==1.3.0
diff --git a/requirements/edx/testing.txt b/requirements/edx/testing.txt
index 723384d300fb22c9c4fe3ea31a4806e0e569c984..c1ac374d63b95f82c0cf74f3336c8857f625e37e 100644
--- a/requirements/edx/testing.txt
+++ b/requirements/edx/testing.txt
@@ -123,7 +123,7 @@ edx-django-oauth2-provider==1.3.5
 edx-django-release-util==0.3.2
 edx-django-sites-extensions==2.3.1
 edx-django-utils==2.0.2
-edx-drf-extensions==2.4.0
+edx-drf-extensions==2.4.5
 edx-enterprise==2.0.17
 edx-i18n-tools==0.4.8
 edx-lint==1.3.0