diff --git a/cms/djangoapps/contentstore/tests/test_course_create_rerun.py b/cms/djangoapps/contentstore/tests/test_course_create_rerun.py
index e23f5f4236..a7c5df8bc7 100644
--- a/cms/djangoapps/contentstore/tests/test_course_create_rerun.py
+++ b/cms/djangoapps/contentstore/tests/test_course_create_rerun.py
@@ -41,7 +41,6 @@ class TestCourseListing(ModuleStoreTestCase):
         for role in [CourseInstructorRole, CourseStaffRole]:
             role(self.source_course_key).add_users(self.user)
 
-
     def tearDown(self):
         """
         Reverse the setup
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
index c6d97ec54d..d3cafad5ca 100644
--- a/cms/djangoapps/contentstore/views/course.py
+++ b/cms/djangoapps/contentstore/views/course.py
@@ -29,8 +29,6 @@ from opaque_keys.edx.locations import Location
 from opaque_keys.edx.keys import CourseKey
 
 from django_future.csrf import ensure_csrf_cookie
-from util.json_request import JsonResponse
-from edxmako.shortcuts import render_to_response
 from contentstore.course_info_model import get_course_updates, update_course_updates, delete_course_update
 from contentstore.utils import (
     add_instructor,
diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index 67bf940d40..05986e8b3d 100644
--- a/cms/envs/devstack.py
+++ b/cms/envs/devstack.py
@@ -38,15 +38,8 @@ FEATURES['ALLOW_ALL_ADVANCED_COMPONENTS'] = True
 ################################# CELERY ######################################
 
 # By default don't use a worker, execute tasks as if they were local functions
-
-# TODO BEWARE: UNCOMMENT THIS BEFORE MERGING INTO MASTER
 CELERY_ALWAYS_EAGER = True
 
-# TODO BEWARE: DO NOT COMMIT THE REST OF THIS SECTION INTO MASTER - FOR LOCAL TESTING ONLY
-# Test with Celery threads
-# CELERY_ALWAYS_EAGER = False
-# BROKER_URL = 'redis://'
-
 ################################ COURSE RERUNS ################################
 
 FEATURES['ALLOW_COURSE_RERUNS'] = True