diff --git a/cms/djangoapps/contentstore/tests/tests.py b/cms/djangoapps/contentstore/tests/tests.py
index 0b1a9f25f4..6c5793fa66 100644
--- a/cms/djangoapps/contentstore/tests/tests.py
+++ b/cms/djangoapps/contentstore/tests/tests.py
@@ -335,7 +335,8 @@ class AuthTestCase(ContentStoreTestCase):
         is turned off
         """
         response = self.client.get(reverse('login'))
-        self.assertNotContains(response,
+        self.assertNotContains(
+            response,
             '<a href="/signup" class="action action-signin">Don&#39;t have a Studio Account? Sign up!</a>'
         )
 
diff --git a/common/lib/xmodule/xmodule/contentstore/utils.py b/common/lib/xmodule/xmodule/contentstore/utils.py
index 5baafcd74f..b7c1413661 100644
--- a/common/lib/xmodule/xmodule/contentstore/utils.py
+++ b/common/lib/xmodule/xmodule/contentstore/utils.py
@@ -16,13 +16,13 @@ def empty_asset_trashcan(course_locs):
         thumbs = store.get_all_content_thumbnails_for_course(course_loc)
         for thumb in thumbs:
             print("Deleting {0}...".format(thumb))
-            store.delete(thumb['_id'])
+            store.delete(thumb['asset_key'])
 
         # then delete all of the assets
         assets, __ = store.get_all_content_for_course(course_loc)
         for asset in assets:
             print("Deleting {0}...".format(asset))
-            store.delete(asset['_id'])
+            store.delete(asset['asset_key'])
 
 
 def restore_asset_from_trashcan(location):