diff --git a/cms/djangoapps/contentstore/utils.py b/cms/djangoapps/contentstore/utils.py
index 9c5bd5c553..cf0c281dd4 100644
--- a/cms/djangoapps/contentstore/utils.py
+++ b/cms/djangoapps/contentstore/utils.py
@@ -75,7 +75,7 @@ def get_course_for_item(location):
     return courses[0]
 
 
-def get_lms_link_for_item(location, course_id=None, preview=False):
+def get_lms_link_for_item(location, preview=False, course_id=None):
     if course_id is None:
         course_id = get_course_id(location)
 
diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index fb050b4988..8068129559 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -2,8 +2,6 @@ import pymongo
 import sys
 import logging
 import copy
-import time
-import traceback
 
 from bson.son import SON
 from fs.osfs import OSFS