diff --git a/flashcards/migrations/0006_auto_20150512_0042.py b/flashcards/migrations/0006_auto_20150512_0042.py
new file mode 100644
index 0000000..3f334b8
--- /dev/null
+++ b/flashcards/migrations/0006_auto_20150512_0042.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+import flashcards.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('flashcards', '0005_auto_20150510_1458'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='flashcard',
+            name='mask',
+            field=flashcards.fields.MaskField(help_text=b'The mask on the card', max_length=255, null=True, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='userflashcard',
+            name='mask',
+            field=flashcards.fields.MaskField(help_text=b'The user-specific mask on the card', max_length=255, null=True, blank=True),
+        ),
+        migrations.DeleteModel(
+            name='FlashcardMask',
+        ),
+    ]
diff --git a/flashcards/models.py b/flashcards/models.py
index 4fe4146..4603843 100644
--- a/flashcards/models.py
+++ b/flashcards/models.py
@@ -1,4 +1,4 @@
-from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, AbstractUser, UserManager
+from django.contrib.auth.models import AbstractUser, UserManager
 from django.db.models import *
 from django.utils.timezone import now
 from simple_email_confirmation import SimpleEmailConfirmationUserMixin
@@ -81,7 +81,6 @@ class UserFlashcard(Model):
         return self.pulled and not self.unpulled
 
 
-
 """
 class FlashcardMask(Model):
     A serialized list of character ranges that can be blanked out during a quiz.
diff --git a/flashcards/tests/test_models.py b/flashcards/tests/test_models.py
index 736f079..555edac 100644
--- a/flashcards/tests/test_models.py
+++ b/flashcards/tests/test_models.py
@@ -1,6 +1,7 @@
+from datetime import datetime
+
 from django.test import TestCase
 from flashcards.models import User, Section, Flashcard
-from datetime import datetime
 
 
 class RegistrationTests(TestCase):
@@ -39,16 +40,16 @@ class FlashcardTests(TestCase):
     def setUp(self):
         user = User.objects.create_user(email="none@none.com", password="1234")
         section = Section.objects.create(department='dept',
-                               course_num='101a',
-                               course_title='how 2 test',
-                               instructor='George Lucas',
-                               quarter='SP15')
+                                         course_num='101a',
+                                         course_title='how 2 test',
+                                         instructor='George Lucas',
+                                         quarter='SP15')
         Flashcard.objects.create(text="This is the text of the Flashcard",
                                  section=section,
                                  author=user,
                                  material_date=datetime.now(),
                                  previous=None,
-                                 mask={(0,4), (24,34)})
+                                 mask={(0, 4), (24, 34)})
 
     def test_mask_field(self):
         user = User.objects.get(email="none@none.com")