diff --git a/mayan/apps/common/compat.py b/mayan/apps/common/compat.py
index 033677fd84..c00f6a9685 100644
--- a/mayan/apps/common/compat.py
+++ b/mayan/apps/common/compat.py
@@ -16,10 +16,6 @@ else:
     dictionary_type = types.DictionaryType
 
 try:
-    from email.Utils import collapse_rfc2231_value
+    from email.Utils import collapse_rfc2231_value  # NOQA
 except ImportError:
-    from email.utils import collapse_rfc2231_value
-
-
-
-
+    from email.utils import collapse_rfc2231_value  # NOQA
diff --git a/mayan/apps/common/management/commands/createsettings.py b/mayan/apps/common/management/commands/createsettings.py
index 9c84254a6b..1dc5f1b8f6 100644
--- a/mayan/apps/common/management/commands/createsettings.py
+++ b/mayan/apps/common/management/commands/createsettings.py
@@ -25,14 +25,6 @@ class Command(management.BaseCommand):
             self.stdout.write(self.style.NOTICE('Existing settings file at: {0}. Backup, remove this file, and try again.'.format(path)))
         else:
             with open(path, 'w+') as file_object:
-                #file_object.write('\n'.join([
-                #    'from __future__ import absolute_import',
-                #    '',
-                #    'from .base import *',
-                #    '',
-                #    "SECRET_KEY = '{0}'".format(Command._generate_secret_key()),
-                #    '',
-                #]))
                 file_object.write(
                     SETTING_FILE_TEMPLATE.format(Command._generate_secret_key())
                 )