diff --git a/lms/envs/bok_choy.env.json b/lms/envs/bok_choy.env.json
index b2963a1f6d..347ba9748a 100644
--- a/lms/envs/bok_choy.env.json
+++ b/lms/envs/bok_choy.env.json
@@ -75,7 +75,6 @@
         "CERTIFICATES_ENABLED": true,
         "CERTIFICATES_HTML_VIEW": true,
         "CERTIFICATES_INSTRUCTOR_GENERATION": true,
-        "MULTIPLE_ENROLLMENT_ROLES": true,
         "ENABLE_PAYMENT_FAKE": true,
         "ENABLE_VERIFIED_CERTIFICATES": true,
         "ENABLE_DISCUSSION_SERVICE": true,
diff --git a/lms/envs/common.py b/lms/envs/common.py
index b4d194157f..1bdcc3af9e 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -190,9 +190,6 @@ FEATURES = {
     # for load testing
     'AUTOMATIC_AUTH_FOR_TESTING': False,
 
-    # Allow users to enroll with methods other than just honor code certificates
-    'MULTIPLE_ENROLLMENT_ROLES': False,
-
     # Toggle the availability of the shopping cart page
     'ENABLE_SHOPPING_CART': False,
 
diff --git a/lms/envs/dev.py b/lms/envs/dev.py
index 34d54b206a..1be98fe037 100644
--- a/lms/envs/dev.py
+++ b/lms/envs/dev.py
@@ -25,7 +25,6 @@ FEATURES['ENABLE_SERVICE_STATUS'] = True
 FEATURES['ENABLE_INSTRUCTOR_EMAIL'] = True     # Enable email for all Studio courses
 FEATURES['REQUIRE_COURSE_EMAIL_AUTH'] = False  # Give all courses email (don't require django-admin perms)
 FEATURES['ENABLE_HINTER_INSTRUCTOR_VIEW'] = True
-FEATURES['MULTIPLE_ENROLLMENT_ROLES'] = True
 FEATURES['ENABLE_SHOPPING_CART'] = True
 FEATURES['AUTOMATIC_VERIFY_STUDENT_IDENTITY_FOR_TESTING'] = True
 FEATURES['ENABLE_S3_GRADE_DOWNLOADS'] = True
diff --git a/lms/urls.py b/lms/urls.py
index f21f8821c0..dc201de5d0 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -8,7 +8,6 @@ from django.views.generic.base import RedirectView
 from ratelimitbackend import admin
 from django.conf.urls.static import static
 
-import django.contrib.auth.views
 from microsite_configuration import microsite
 import auth_exchange.views
 
@@ -103,6 +102,11 @@ urlpatterns = (
     url(r'^api/credit/', include('openedx.core.djangoapps.credit.urls', app_name="credit", namespace='credit')),
     url(r'^rss_proxy/', include('rss_proxy.urls', namespace='rss_proxy')),
     url(r'^api/organizations/', include('organizations.urls', namespace='organizations')),
+
+    # Multiple course modes and identity verification
+    # TODO Namespace these!
+    url(r'^course_modes/', include('course_modes.urls')),
+    url(r'^verify_student/', include('verify_student.urls')),
 )
 
 if settings.FEATURES["ENABLE_COMBINED_LOGIN_REGISTRATION"]:
@@ -125,13 +129,6 @@ if settings.FEATURES["ENABLE_MOBILE_REST_API"]:
         url(r'^api/mobile/v0.5/', include('mobile_api.urls')),
     )
 
-# if settings.FEATURES.get("MULTIPLE_ENROLLMENT_ROLES"):
-urlpatterns += (
-    # TODO Namespace these!
-    url(r'^verify_student/', include('verify_student.urls')),
-    url(r'^course_modes/', include('course_modes.urls')),
-)
-
 js_info_dict = {
     'domain': 'djangojs',
     # We need to explicitly include external Django apps that are not in LOCALE_PATHS.