diff --git a/galaxy/accounts/migrations/0001_initial.py b/galaxy/accounts/migrations/0001_initial.py
index 8672c9ce1..8295dc8df 100644
--- a/galaxy/accounts/migrations/0001_initial.py
+++ b/galaxy/accounts/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import re
 import django.contrib.auth.models
diff --git a/galaxy/accounts/migrations/0002_auto_20150803_1328.py b/galaxy/accounts/migrations/0002_auto_20150803_1328.py
index 724823ce5..536b26adf 100644
--- a/galaxy/accounts/migrations/0002_auto_20150803_1328.py
+++ b/galaxy/accounts/migrations/0002_auto_20150803_1328.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/accounts/migrations/0003_auto_20151125_0840.py b/galaxy/accounts/migrations/0003_auto_20151125_0840.py
index 0a3a35d3b..672eb95dd 100644
--- a/galaxy/accounts/migrations/0003_auto_20151125_0840.py
+++ b/galaxy/accounts/migrations/0003_auto_20151125_0840.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/accounts/migrations/0004_customuser_cache_refreshed.py b/galaxy/accounts/migrations/0004_customuser_cache_refreshed.py
index 84a97760a..24f65a2ab 100644
--- a/galaxy/accounts/migrations/0004_customuser_cache_refreshed.py
+++ b/galaxy/accounts/migrations/0004_customuser_cache_refreshed.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/accounts/migrations/0005_github_attrs.py b/galaxy/accounts/migrations/0005_github_attrs.py
index a00c15dd8..2c662f9c4 100644
--- a/galaxy/accounts/migrations/0005_github_attrs.py
+++ b/galaxy/accounts/migrations/0005_github_attrs.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-04-10 11:09
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/accounts/migrations/0006_remove_customuser_github_user.py b/galaxy/accounts/migrations/0006_remove_customuser_github_user.py
index aa5ce0249..13ec876f2 100644
--- a/galaxy/accounts/migrations/0006_remove_customuser_github_user.py
+++ b/galaxy/accounts/migrations/0006_remove_customuser_github_user.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-06-28 17:03
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/accounts/migrations/0007_auto_20180821_1259.py b/galaxy/accounts/migrations/0007_auto_20180821_1259.py
index 988f36283..f3f51d872 100644
--- a/galaxy/accounts/migrations/0007_auto_20180821_1259.py
+++ b/galaxy/accounts/migrations/0007_auto_20180821_1259.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-08-21 16:59
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/accounts/migrations/0008_auto_20181011_1056.py b/galaxy/accounts/migrations/0008_auto_20181011_1056.py
index da758dbf7..1af0566a4 100644
--- a/galaxy/accounts/migrations/0008_auto_20181011_1056.py
+++ b/galaxy/accounts/migrations/0008_auto_20181011_1056.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-10-11 14:56
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/accounts/migrations/0009_auto_20181018_1248.py b/galaxy/accounts/migrations/0009_auto_20181018_1248.py
index 93d3a7117..eff916e6b 100644
--- a/galaxy/accounts/migrations/0009_auto_20181018_1248.py
+++ b/galaxy/accounts/migrations/0009_auto_20181018_1248.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-18 16:48
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/accounts/models.py b/galaxy/accounts/models.py
index 08499940b..7adeb7754 100644
--- a/galaxy/accounts/models.py
+++ b/galaxy/accounts/models.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import unicode_literals
-
 import re
 
 from django.contrib.auth import models as auth_models
diff --git a/galaxy/accounts/tests/test_custom_user_model.py b/galaxy/accounts/tests/test_custom_user_model.py
index 68a7bddf0..e74662c13 100644
--- a/galaxy/accounts/tests/test_custom_user_model.py
+++ b/galaxy/accounts/tests/test_custom_user_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 # This file is part of Ansible Galaxy
 #
diff --git a/galaxy/api/views/views.py b/galaxy/api/views/views.py
index fba874c59..1e4234805 100644
--- a/galaxy/api/views/views.py
+++ b/galaxy/api/views/views.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import print_function
-
 import logging
 from collections import OrderedDict
 from allauth.socialaccount.models import SocialToken
diff --git a/galaxy/common/logutils.py b/galaxy/common/logutils.py
index 2d2e04284..654a49dc1 100644
--- a/galaxy/common/logutils.py
+++ b/galaxy/common/logutils.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 import logging
 
 from galaxy import constants
diff --git a/galaxy/common/version.py b/galaxy/common/version.py
index 0ebe83bf8..e1ec34390 100644
--- a/galaxy/common/version.py
+++ b/galaxy/common/version.py
@@ -14,7 +14,6 @@
 #
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
-from __future__ import unicode_literals
 
 import subprocess
 
diff --git a/galaxy/constants.py b/galaxy/constants.py
index 4087d1d33..69bd7df82 100644
--- a/galaxy/constants.py
+++ b/galaxy/constants.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import unicode_literals
-
 import enum
 import logging
 import re
diff --git a/galaxy/importer/collection.py b/galaxy/importer/collection.py
index e07cdae57..54b7ab55a 100644
--- a/galaxy/importer/collection.py
+++ b/galaxy/importer/collection.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 import os
 import logging
 
diff --git a/galaxy/importer/repository.py b/galaxy/importer/repository.py
index f6d71e3da..f982c8617 100644
--- a/galaxy/importer/repository.py
+++ b/galaxy/importer/repository.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 import logging
 
 from galaxy import constants
diff --git a/galaxy/importer/utils/ast.py b/galaxy/importer/utils/ast.py
index 6eefb7603..e8e43f2d1 100644
--- a/galaxy/importer/utils/ast.py
+++ b/galaxy/importer/utils/ast.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 import ast
 
 import yaml
diff --git a/galaxy/main/management/commands/refresh_role_counts.py b/galaxy/main/management/commands/refresh_role_counts.py
index 5a2848dce..8f36c82e9 100644
--- a/galaxy/main/management/commands/refresh_role_counts.py
+++ b/galaxy/main/management/commands/refresh_role_counts.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import print_function
-
 import time
 import logging
 
diff --git a/galaxy/main/migrations/0001_initial.py b/galaxy/main/migrations/0001_initial.py
index d7b51a06c..3c03255ec 100644
--- a/galaxy/main/migrations/0001_initial.py
+++ b/galaxy/main/migrations/0001_initial.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.mixins
 from django.conf import settings
@@ -406,9 +404,9 @@ class Migration(migrations.Migration):
             options={'verbose_name_plural': 'UserAliases'},
         ),
         migrations.AlterUniqueTogether(
-            name='rolerating', unique_together=set([('owner', 'role')])
+            name='rolerating', unique_together={('owner', 'role')}
         ),
         migrations.AlterUniqueTogether(
-            name='role', unique_together=set([('owner', 'name')])
+            name='role', unique_together={('owner', 'name')}
         ),
     ]
diff --git a/galaxy/main/migrations/0002_auto_20150824_1342.py b/galaxy/main/migrations/0002_auto_20150824_1342.py
index 6134702c6..aba521846 100644
--- a/galaxy/main/migrations/0002_auto_20150824_1342.py
+++ b/galaxy/main/migrations/0002_auto_20150824_1342.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0003_auto_20150824_1354.py b/galaxy/main/migrations/0003_auto_20150824_1354.py
index d17a47641..b0b6fc761 100644
--- a/galaxy/main/migrations/0003_auto_20150824_1354.py
+++ b/galaxy/main/migrations/0003_auto_20150824_1354.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0004_auto_20150824_1430.py b/galaxy/main/migrations/0004_auto_20150824_1430.py
index ca976c73b..7884d2a77 100644
--- a/galaxy/main/migrations/0004_auto_20150824_1430.py
+++ b/galaxy/main/migrations/0004_auto_20150824_1430.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 import math
diff --git a/galaxy/main/migrations/0005_auto_20150824_1444.py b/galaxy/main/migrations/0005_auto_20150824_1444.py
index 82381fa93..92409a526 100644
--- a/galaxy/main/migrations/0005_auto_20150824_1444.py
+++ b/galaxy/main/migrations/0005_auto_20150824_1444.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 from galaxy.api.aggregators import AvgWithZeroForNull
diff --git a/galaxy/main/migrations/0006_auto_20150825_1720.py b/galaxy/main/migrations/0006_auto_20150825_1720.py
index 3c7363483..7b8dd6f81 100644
--- a/galaxy/main/migrations/0006_auto_20150825_1720.py
+++ b/galaxy/main/migrations/0006_auto_20150825_1720.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
@@ -14,6 +12,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterIndexTogether(
             name='platform',
-            index_together=set([('id', 'name')]),
+            index_together={('id', 'name')},
         ),
     ]
diff --git a/galaxy/main/migrations/0007_auto_20150825_1723.py b/galaxy/main/migrations/0007_auto_20150825_1723.py
index b2dc4e352..161858f4b 100644
--- a/galaxy/main/migrations/0007_auto_20150825_1723.py
+++ b/galaxy/main/migrations/0007_auto_20150825_1723.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
@@ -14,6 +12,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterIndexTogether(
             name='platform',
-            index_together=set([('name', 'id')]),
+            index_together={('name', 'id')},
         ),
     ]
diff --git a/galaxy/main/migrations/0008_auto_20150825_1737.py b/galaxy/main/migrations/0008_auto_20150825_1737.py
index 2ed4f2563..73f74daca 100644
--- a/galaxy/main/migrations/0008_auto_20150825_1737.py
+++ b/galaxy/main/migrations/0008_auto_20150825_1737.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
@@ -14,6 +12,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterIndexTogether(
             name='platform',
-            index_together=set([]),
+            index_together=set(),
         ),
     ]
diff --git a/galaxy/main/migrations/0009_auto_20150826_0829.py b/galaxy/main/migrations/0009_auto_20150826_0829.py
index 1459a1a77..b5664c2a3 100644
--- a/galaxy/main/migrations/0009_auto_20150826_0829.py
+++ b/galaxy/main/migrations/0009_auto_20150826_0829.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0010_auto_20150826_1017.py b/galaxy/main/migrations/0010_auto_20150826_1017.py
index f8f6c98f3..562d8a0da 100644
--- a/galaxy/main/migrations/0010_auto_20150826_1017.py
+++ b/galaxy/main/migrations/0010_auto_20150826_1017.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0014_auto_20150917_1211.py b/galaxy/main/migrations/0014_auto_20150917_1211.py
index a610e5573..c693ec284 100644
--- a/galaxy/main/migrations/0014_auto_20150917_1211.py
+++ b/galaxy/main/migrations/0014_auto_20150917_1211.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations, IntegrityError
 
 import galaxy.main.fields
diff --git a/galaxy/main/migrations/0015_auto_20150917_1504.py b/galaxy/main/migrations/0015_auto_20150917_1504.py
index dc3377fc7..468426abb 100644
--- a/galaxy/main/migrations/0015_auto_20150917_1504.py
+++ b/galaxy/main/migrations/0015_auto_20150917_1504.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0016_auto_20150922_1041.py b/galaxy/main/migrations/0016_auto_20150922_1041.py
index e0a3a2f87..74f534896 100644
--- a/galaxy/main/migrations/0016_auto_20150922_1041.py
+++ b/galaxy/main/migrations/0016_auto_20150922_1041.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0017_auto_20151104_1700.py b/galaxy/main/migrations/0017_auto_20151104_1700.py
index 0f2fb6b77..10d501ee2 100644
--- a/galaxy/main/migrations/0017_auto_20151104_1700.py
+++ b/galaxy/main/migrations/0017_auto_20151104_1700.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0018_auto_20151104_1701.py b/galaxy/main/migrations/0018_auto_20151104_1701.py
index 4ec70614e..6359c18bd 100644
--- a/galaxy/main/migrations/0018_auto_20151104_1701.py
+++ b/galaxy/main/migrations/0018_auto_20151104_1701.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0019_auto_20151113_0936.py b/galaxy/main/migrations/0019_auto_20151113_0936.py
index 0234dead4..d0af85f5d 100644
--- a/galaxy/main/migrations/0019_auto_20151113_0936.py
+++ b/galaxy/main/migrations/0019_auto_20151113_0936.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.mixins
 from django.conf import settings
diff --git a/galaxy/main/migrations/0020_auto_20151118_1350.py b/galaxy/main/migrations/0020_auto_20151118_1350.py
index 0101141fc..a9aad88fb 100644
--- a/galaxy/main/migrations/0020_auto_20151118_1350.py
+++ b/galaxy/main/migrations/0020_auto_20151118_1350.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0021_auto_20151118_1425.py b/galaxy/main/migrations/0021_auto_20151118_1425.py
index a087e07f0..20bbe2453 100644
--- a/galaxy/main/migrations/0021_auto_20151118_1425.py
+++ b/galaxy/main/migrations/0021_auto_20151118_1425.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0022_auto_20151118_1642.py b/galaxy/main/migrations/0022_auto_20151118_1642.py
index 0cb35940f..3f496006f 100644
--- a/galaxy/main/migrations/0022_auto_20151118_1642.py
+++ b/galaxy/main/migrations/0022_auto_20151118_1642.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0023_auto_20151119_2020.py b/galaxy/main/migrations/0023_auto_20151119_2020.py
index c8a8d6cca..155735fb1 100644
--- a/galaxy/main/migrations/0023_auto_20151119_2020.py
+++ b/galaxy/main/migrations/0023_auto_20151119_2020.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0024_importtask_finished.py b/galaxy/main/migrations/0024_importtask_finished.py
index d7b988239..cbbb48bb5 100644
--- a/galaxy/main/migrations/0024_importtask_finished.py
+++ b/galaxy/main/migrations/0024_importtask_finished.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0025_auto_20151120_1006.py b/galaxy/main/migrations/0025_auto_20151120_1006.py
index 25de46c79..c8c3b744a 100644
--- a/galaxy/main/migrations/0025_auto_20151120_1006.py
+++ b/galaxy/main/migrations/0025_auto_20151120_1006.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0026_auto_20151122_0827.py b/galaxy/main/migrations/0026_auto_20151122_0827.py
index a8fb49e85..fb0e5def0 100644
--- a/galaxy/main/migrations/0026_auto_20151122_0827.py
+++ b/galaxy/main/migrations/0026_auto_20151122_0827.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 import galaxy.main.fields
diff --git a/galaxy/main/migrations/0027_auto_20151125_0009.py b/galaxy/main/migrations/0027_auto_20151125_0009.py
index 521da68cf..dffab4c05 100644
--- a/galaxy/main/migrations/0027_auto_20151125_0009.py
+++ b/galaxy/main/migrations/0027_auto_20151125_0009.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0028_auto_20151125_1231.py b/galaxy/main/migrations/0028_auto_20151125_1231.py
index b866d24f5..795a634be 100644
--- a/galaxy/main/migrations/0028_auto_20151125_1231.py
+++ b/galaxy/main/migrations/0028_auto_20151125_1231.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0029_importtask_github_branch.py b/galaxy/main/migrations/0029_importtask_github_branch.py
index 6b2a773b5..760318493 100644
--- a/galaxy/main/migrations/0029_importtask_github_branch.py
+++ b/galaxy/main/migrations/0029_importtask_github_branch.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0030_auto_20151127_0824.py b/galaxy/main/migrations/0030_auto_20151127_0824.py
index c9205c7e8..b07ddd9f5 100644
--- a/galaxy/main/migrations/0030_auto_20151127_0824.py
+++ b/galaxy/main/migrations/0030_auto_20151127_0824.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.mixins
 from django.conf import settings
diff --git a/galaxy/main/migrations/0031_auto_20151129_1230.py b/galaxy/main/migrations/0031_auto_20151129_1230.py
index 893f521a2..f11210212 100644
--- a/galaxy/main/migrations/0031_auto_20151129_1230.py
+++ b/galaxy/main/migrations/0031_auto_20151129_1230.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 
diff --git a/galaxy/main/migrations/0032_role_download_count.py b/galaxy/main/migrations/0032_role_download_count.py
index 37d66e66c..b17ea039d 100644
--- a/galaxy/main/migrations/0032_role_download_count.py
+++ b/galaxy/main/migrations/0032_role_download_count.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0033_refreshrolecount.py b/galaxy/main/migrations/0033_refreshrolecount.py
index a667cbc8d..55abb14fb 100644
--- a/galaxy/main/migrations/0033_refreshrolecount.py
+++ b/galaxy/main/migrations/0033_refreshrolecount.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.fields
 import galaxy.main.mixins
diff --git a/galaxy/main/migrations/0034_auto_20151203_0014.py b/galaxy/main/migrations/0034_auto_20151203_0014.py
index 522dfb0ca..7338afdcb 100644
--- a/galaxy/main/migrations/0034_auto_20151203_0014.py
+++ b/galaxy/main/migrations/0034_auto_20151203_0014.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0035_remove_roleversion_release_date.py b/galaxy/main/migrations/0035_remove_roleversion_release_date.py
index e152b173a..49c1bd87b 100644
--- a/galaxy/main/migrations/0035_remove_roleversion_release_date.py
+++ b/galaxy/main/migrations/0035_remove_roleversion_release_date.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0036_auto_20151205_2254.py b/galaxy/main/migrations/0036_auto_20151205_2254.py
index a6b5bc895..065300121 100644
--- a/galaxy/main/migrations/0036_auto_20151205_2254.py
+++ b/galaxy/main/migrations/0036_auto_20151205_2254.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0037_roleversion_release_date.py b/galaxy/main/migrations/0037_roleversion_release_date.py
index bfcb8ec0b..e7373bba5 100644
--- a/galaxy/main/migrations/0037_roleversion_release_date.py
+++ b/galaxy/main/migrations/0037_roleversion_release_date.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0038_role_github_default_branch.py b/galaxy/main/migrations/0038_role_github_default_branch.py
index 0c4af5df2..419044c48 100644
--- a/galaxy/main/migrations/0038_role_github_default_branch.py
+++ b/galaxy/main/migrations/0038_role_github_default_branch.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0039_namespace.py b/galaxy/main/migrations/0039_namespace.py
index bdc222d89..9f7c72106 100644
--- a/galaxy/main/migrations/0039_namespace.py
+++ b/galaxy/main/migrations/0039_namespace.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.fields
 import galaxy.main.mixins
diff --git a/galaxy/main/migrations/0040_auto_20160206_0921.py b/galaxy/main/migrations/0040_auto_20160206_0921.py
index 440dda391..7ccdf52f1 100644
--- a/galaxy/main/migrations/0040_auto_20160206_0921.py
+++ b/galaxy/main/migrations/0040_auto_20160206_0921.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0041_auto_20160207_2148.py b/galaxy/main/migrations/0041_auto_20160207_2148.py
index de29706b9..aa6c42588 100644
--- a/galaxy/main/migrations/0041_auto_20160207_2148.py
+++ b/galaxy/main/migrations/0041_auto_20160207_2148.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0042_auto_20160721_2318.py b/galaxy/main/migrations/0042_auto_20160721_2318.py
index ad1853b8f..8954d6109 100644
--- a/galaxy/main/migrations/0042_auto_20160721_2318.py
+++ b/galaxy/main/migrations/0042_auto_20160721_2318.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0043_role_role_type.py b/galaxy/main/migrations/0043_role_role_type.py
index 7a0be6014..e44ed9a8f 100644
--- a/galaxy/main/migrations/0043_role_role_type.py
+++ b/galaxy/main/migrations/0043_role_role_type.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0044_auto_20160916_0839.py b/galaxy/main/migrations/0044_auto_20160916_0839.py
index 40457d6c3..9812d82d8 100644
--- a/galaxy/main/migrations/0044_auto_20160916_0839.py
+++ b/galaxy/main/migrations/0044_auto_20160916_0839.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0045_role_commit_created.py b/galaxy/main/migrations/0045_role_commit_created.py
index 907a217fb..2c130d971 100644
--- a/galaxy/main/migrations/0045_role_commit_created.py
+++ b/galaxy/main/migrations/0045_role_commit_created.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0046_auto_20160930_1752.py b/galaxy/main/migrations/0046_auto_20160930_1752.py
index b344fc10f..3224c2f94 100644
--- a/galaxy/main/migrations/0046_auto_20160930_1752.py
+++ b/galaxy/main/migrations/0046_auto_20160930_1752.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0047_refreshrolecount_deleted.py b/galaxy/main/migrations/0047_refreshrolecount_deleted.py
index 8f920ab8c..fdf20b992 100644
--- a/galaxy/main/migrations/0047_refreshrolecount_deleted.py
+++ b/galaxy/main/migrations/0047_refreshrolecount_deleted.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0048_refreshrolecount_skipped.py b/galaxy/main/migrations/0048_refreshrolecount_skipped.py
index 5c9b87173..1a8a5ab57 100644
--- a/galaxy/main/migrations/0048_refreshrolecount_skipped.py
+++ b/galaxy/main/migrations/0048_refreshrolecount_skipped.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0049_auto_20161013_1744.py b/galaxy/main/migrations/0049_auto_20161013_1744.py
index c88d9a9d0..55152f2d3 100644
--- a/galaxy/main/migrations/0049_auto_20161013_1744.py
+++ b/galaxy/main/migrations/0049_auto_20161013_1744.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0050_auto_20171024_0354.py b/galaxy/main/migrations/0050_auto_20171024_0354.py
index 6de676577..7871e69c6 100644
--- a/galaxy/main/migrations/0050_auto_20171024_0354.py
+++ b/galaxy/main/migrations/0050_auto_20171024_0354.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.fields
 import galaxy.main.mixins
diff --git a/galaxy/main/migrations/0051_auto_20171108_2028.py b/galaxy/main/migrations/0051_auto_20171108_2028.py
index 2683c3971..9e8e2bea7 100644
--- a/galaxy/main/migrations/0051_auto_20171108_2028.py
+++ b/galaxy/main/migrations/0051_auto_20171108_2028.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0052_auto_20171108_2113.py b/galaxy/main/migrations/0052_auto_20171108_2113.py
index ceff06682..5840e403f 100644
--- a/galaxy/main/migrations/0052_auto_20171108_2113.py
+++ b/galaxy/main/migrations/0052_auto_20171108_2113.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0053_cloudplatform.py b/galaxy/main/migrations/0053_cloudplatform.py
index b070073c8..5e8b1e28f 100644
--- a/galaxy/main/migrations/0053_cloudplatform.py
+++ b/galaxy/main/migrations/0053_cloudplatform.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.fields
 import galaxy.main.mixins
diff --git a/galaxy/main/migrations/0054_role_type_demo.py b/galaxy/main/migrations/0054_role_type_demo.py
index a54b8b46b..d71f4e631 100644
--- a/galaxy/main/migrations/0054_role_type_demo.py
+++ b/galaxy/main/migrations/0054_role_type_demo.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0055_contentblock.py b/galaxy/main/migrations/0055_contentblock.py
index de23388b5..a3034d0ae 100644
--- a/galaxy/main/migrations/0055_contentblock.py
+++ b/galaxy/main/migrations/0055_contentblock.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.mixins
 
diff --git a/galaxy/main/migrations/0056_role_unique_repos.py b/galaxy/main/migrations/0056_role_unique_repos.py
index a32c8ee75..958f3e09b 100644
--- a/galaxy/main/migrations/0056_role_unique_repos.py
+++ b/galaxy/main/migrations/0056_role_unique_repos.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0057_stargazer_role_reference.py b/galaxy/main/migrations/0057_stargazer_role_reference.py
index 71b9a9e39..8fdbfa225 100644
--- a/galaxy/main/migrations/0057_stargazer_role_reference.py
+++ b/galaxy/main/migrations/0057_stargazer_role_reference.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0058_stargazer_role_not_null.py b/galaxy/main/migrations/0058_stargazer_role_not_null.py
index b0588e9ee..69851b5a8 100644
--- a/galaxy/main/migrations/0058_stargazer_role_not_null.py
+++ b/galaxy/main/migrations/0058_stargazer_role_not_null.py
@@ -1,7 +1,5 @@
 # NOTE(cutwater): This migration is replaced by v2_4_0 and should be
 #   deleted once superseding migration is merged into master.
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0059_drop_role_rating.py b/galaxy/main/migrations/0059_drop_role_rating.py
index 9de405bcf..2deaf4068 100644
--- a/galaxy/main/migrations/0059_drop_role_rating.py
+++ b/galaxy/main/migrations/0059_drop_role_rating.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
@@ -13,7 +10,7 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterUniqueTogether(
             name='rolerating',
-            unique_together=set([]),
+            unique_together=set(),
         ),
         migrations.RemoveField(
             model_name='rolerating',
diff --git a/galaxy/main/migrations/0060_user_repository.py b/galaxy/main/migrations/0060_user_repository.py
index 926f9402a..a272e22cf 100644
--- a/galaxy/main/migrations/0060_user_repository.py
+++ b/galaxy/main/migrations/0060_user_repository.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 
diff --git a/galaxy/main/migrations/0061_role_repo_ref.py b/galaxy/main/migrations/0061_role_repo_ref.py
index 02f3712a6..302e9ff07 100644
--- a/galaxy/main/migrations/0061_role_repo_ref.py
+++ b/galaxy/main/migrations/0061_role_repo_ref.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0062_move_repository_counters.py b/galaxy/main/migrations/0062_move_repository_counters.py
index 4673bb942..6eefdf64a 100644
--- a/galaxy/main/migrations/0062_move_repository_counters.py
+++ b/galaxy/main/migrations/0062_move_repository_counters.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 UPGRADE_REPOSITORY_COUNTERS = """
diff --git a/galaxy/main/migrations/0063_remove_deprecated_role_fields.py b/galaxy/main/migrations/0063_remove_deprecated_role_fields.py
index 75d48195c..fd24320f3 100644
--- a/galaxy/main/migrations/0063_remove_deprecated_role_fields.py
+++ b/galaxy/main/migrations/0063_remove_deprecated_role_fields.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0064_rename_role.py b/galaxy/main/migrations/0064_rename_role.py
index 36b878b6c..ecd16d3c9 100644
--- a/galaxy/main/migrations/0064_rename_role.py
+++ b/galaxy/main/migrations/0064_rename_role.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0065_namespace_refactor.py b/galaxy/main/migrations/0065_namespace_refactor.py
index 658d89479..515d5e9ed 100644
--- a/galaxy/main/migrations/0065_namespace_refactor.py
+++ b/galaxy/main/migrations/0065_namespace_refactor.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 from django.conf import settings
 
diff --git a/galaxy/main/migrations/0066_content_type.py b/galaxy/main/migrations/0066_content_type.py
index 4a0c358c6..d57d45ef0 100644
--- a/galaxy/main/migrations/0066_content_type.py
+++ b/galaxy/main/migrations/0066_content_type.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 import galaxy.main.mixins
 import galaxy.main.fields
diff --git a/galaxy/main/migrations/0067_bind_stargazers_to_repo.py b/galaxy/main/migrations/0067_bind_stargazers_to_repo.py
index 3501b9d35..813c5f6c4 100644
--- a/galaxy/main/migrations/0067_bind_stargazers_to_repo.py
+++ b/galaxy/main/migrations/0067_bind_stargazers_to_repo.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0068_auto_20180102_1126.py b/galaxy/main/migrations/0068_auto_20180102_1126.py
index 9c85ab957..a248a8acf 100644
--- a/galaxy/main/migrations/0068_auto_20180102_1126.py
+++ b/galaxy/main/migrations/0068_auto_20180102_1126.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0069_importtask_repository_ref.py b/galaxy/main/migrations/0069_importtask_repository_ref.py
index e0c28b7cc..c7ce1aff1 100644
--- a/galaxy/main/migrations/0069_importtask_repository_ref.py
+++ b/galaxy/main/migrations/0069_importtask_repository_ref.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0070_remove_importtask_github_counters.py b/galaxy/main/migrations/0070_remove_importtask_github_counters.py
index 7b4bd42e4..e599604d9 100644
--- a/galaxy/main/migrations/0070_remove_importtask_github_counters.py
+++ b/galaxy/main/migrations/0070_remove_importtask_github_counters.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0071_drop_original_name.py b/galaxy/main/migrations/0071_drop_original_name.py
index 6d868539f..1a3545847 100644
--- a/galaxy/main/migrations/0071_drop_original_name.py
+++ b/galaxy/main/migrations/0071_drop_original_name.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0072_add_fields_choices.py b/galaxy/main/migrations/0072_add_fields_choices.py
index 5f3392af1..15ddb3a77 100644
--- a/galaxy/main/migrations/0072_add_fields_choices.py
+++ b/galaxy/main/migrations/0072_add_fields_choices.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0073_original_name.py b/galaxy/main/migrations/0073_original_name.py
index 77ec63b37..7229d8a5f 100644
--- a/galaxy/main/migrations/0073_original_name.py
+++ b/galaxy/main/migrations/0073_original_name.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 UPGRADE_FIX_CONTENT_EMPTY_NAME = """
diff --git a/galaxy/main/migrations/0074_repo_import_branch.py b/galaxy/main/migrations/0074_repo_import_branch.py
index d284ad224..d87ccce15 100644
--- a/galaxy/main/migrations/0074_repo_import_branch.py
+++ b/galaxy/main/migrations/0074_repo_import_branch.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0075_repo_namespace_ref.py b/galaxy/main/migrations/0075_repo_namespace_ref.py
index bd782d06d..25cac8419 100644
--- a/galaxy/main/migrations/0075_repo_namespace_ref.py
+++ b/galaxy/main/migrations/0075_repo_namespace_ref.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0076_content_namespace_ref.py b/galaxy/main/migrations/0076_content_namespace_ref.py
index 0059f6416..39dcf5cd6 100644
--- a/galaxy/main/migrations/0076_content_namespace_ref.py
+++ b/galaxy/main/migrations/0076_content_namespace_ref.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0077_auto_20180201_1639.py b/galaxy/main/migrations/0077_auto_20180201_1639.py
index 3984e4115..ec50e723f 100644
--- a/galaxy/main/migrations/0077_auto_20180201_1639.py
+++ b/galaxy/main/migrations/0077_auto_20180201_1639.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 import galaxy.main.fields
diff --git a/galaxy/main/migrations/0078_auto_20180208_0629.py b/galaxy/main/migrations/0078_auto_20180208_0629.py
index 99bb9c037..c2893ae5d 100644
--- a/galaxy/main/migrations/0078_auto_20180208_0629.py
+++ b/galaxy/main/migrations/0078_auto_20180208_0629.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 
diff --git a/galaxy/main/migrations/0079_auto_20180208_0650.py b/galaxy/main/migrations/0079_auto_20180208_0650.py
index 59bef380c..d98357024 100644
--- a/galaxy/main/migrations/0079_auto_20180208_0650.py
+++ b/galaxy/main/migrations/0079_auto_20180208_0650.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 UPGRADE_SET_EMPTY_IMPORT_BRANCH_TO_NULL = """
diff --git a/galaxy/main/migrations/0080_auto_20180212_1111.py b/galaxy/main/migrations/0080_auto_20180212_1111.py
index 30586ab75..33da41fe0 100644
--- a/galaxy/main/migrations/0080_auto_20180212_1111.py
+++ b/galaxy/main/migrations/0080_auto_20180212_1111.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 import galaxy.main.fields
 
diff --git a/galaxy/main/migrations/0081_content_metadata.py b/galaxy/main/migrations/0081_content_metadata.py
index 4464bc45a..6e2011b79 100644
--- a/galaxy/main/migrations/0081_content_metadata.py
+++ b/galaxy/main/migrations/0081_content_metadata.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 from django.contrib.postgres import fields as psql_fields
 
diff --git a/galaxy/main/migrations/0082_apb_content_type.py b/galaxy/main/migrations/0082_apb_content_type.py
index faf3af630..e9a688983 100644
--- a/galaxy/main/migrations/0082_apb_content_type.py
+++ b/galaxy/main/migrations/0082_apb_content_type.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import models, migrations
 
 INSERT_APB_CONTENT_TYPE = """
diff --git a/galaxy/main/migrations/0083_content_search_vector.py b/galaxy/main/migrations/0083_content_search_vector.py
index 97a6e00f2..a5de369ca 100644
--- a/galaxy/main/migrations/0083_content_search_vector.py
+++ b/galaxy/main/migrations/0083_content_search_vector.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.10 on 2018-03-05 16:56
-from __future__ import unicode_literals
-
 from django.contrib.postgres import indexes as psql_indexes
 from django.contrib.postgres import search as psql_search
 from django.db import migrations
diff --git a/galaxy/main/migrations/0084_content_block_update.py b/galaxy/main/migrations/0084_content_block_update.py
index add26a30e..70efafbe7 100644
--- a/galaxy/main/migrations/0084_content_block_update.py
+++ b/galaxy/main/migrations/0084_content_block_update.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0085_auto_20180328_1130.py b/galaxy/main/migrations/0085_auto_20180328_1130.py
index bdb0d81c6..c0ec00a88 100644
--- a/galaxy/main/migrations/0085_auto_20180328_1130.py
+++ b/galaxy/main/migrations/0085_auto_20180328_1130.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-03-28 15:30
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0086_auto_20180328_1147.py b/galaxy/main/migrations/0086_auto_20180328_1147.py
index 5cb42ed70..250374d52 100644
--- a/galaxy/main/migrations/0086_auto_20180328_1147.py
+++ b/galaxy/main/migrations/0086_auto_20180328_1147.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-03-28 15:47
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 UPGRADE_SET_TRAVIS_URLS = """
diff --git a/galaxy/main/migrations/0088_auto_20180328_1209.py b/galaxy/main/migrations/0088_auto_20180328_1209.py
index 40510a231..fee058568 100644
--- a/galaxy/main/migrations/0088_auto_20180328_1209.py
+++ b/galaxy/main/migrations/0088_auto_20180328_1209.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-03-28 16:09
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0090_issue_tracker_url.py b/galaxy/main/migrations/0090_issue_tracker_url.py
index 4e9fba258..08e252604 100644
--- a/galaxy/main/migrations/0090_issue_tracker_url.py
+++ b/galaxy/main/migrations/0090_issue_tracker_url.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-04-11 15:29
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0092_content_module_utils.py b/galaxy/main/migrations/0092_content_module_utils.py
index 86af8a239..53414d1e7 100644
--- a/galaxy/main/migrations/0092_content_module_utils.py
+++ b/galaxy/main/migrations/0092_content_module_utils.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.11 on 2018-04-13 09:55
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0093_link_content_version_w_repo.py b/galaxy/main/migrations/0093_link_content_version_w_repo.py
index a1ffb70e7..6dfa4d233 100644
--- a/galaxy/main/migrations/0093_link_content_version_w_repo.py
+++ b/galaxy/main/migrations/0093_link_content_version_w_repo.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0094_import_branch.py b/galaxy/main/migrations/0094_import_branch.py
index 2411a2468..d10fc5384 100644
--- a/galaxy/main/migrations/0094_import_branch.py
+++ b/galaxy/main/migrations/0094_import_branch.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0095_repository_version_unique.py b/galaxy/main/migrations/0095_repository_version_unique.py
index 8e2db9990..f0b5ff736 100644
--- a/galaxy/main/migrations/0095_repository_version_unique.py
+++ b/galaxy/main/migrations/0095_repository_version_unique.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 DELETE_DUPLICATE_REPOSITORY_VERSIONS = """
diff --git a/galaxy/main/migrations/0096_repository_format.py b/galaxy/main/migrations/0096_repository_format.py
index 4025322b2..33f411f73 100644
--- a/galaxy/main/migrations/0096_repository_format.py
+++ b/galaxy/main/migrations/0096_repository_format.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-16 10:37
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0097_delete_empty_repos.py b/galaxy/main/migrations/0097_delete_empty_repos.py
index 9e1673023..488f2993e 100644
--- a/galaxy/main/migrations/0097_delete_empty_repos.py
+++ b/galaxy/main/migrations/0097_delete_empty_repos.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import logging
 
 from django.db import migrations
diff --git a/galaxy/main/migrations/0098_readme.py b/galaxy/main/migrations/0098_readme.py
index 4415d0711..8e357ad49 100644
--- a/galaxy/main/migrations/0098_readme.py
+++ b/galaxy/main/migrations/0098_readme.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import hashlib
 
 from django.db import migrations
diff --git a/galaxy/main/migrations/0099_namespace_vendor.py b/galaxy/main/migrations/0099_namespace_vendor.py
index 3ec0f5636..2b8c8434a 100644
--- a/galaxy/main/migrations/0099_namespace_vendor.py
+++ b/galaxy/main/migrations/0099_namespace_vendor.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-22 17:15
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0100_notifications.py b/galaxy/main/migrations/0100_notifications.py
index 7bd873493..4c8f02450 100644
--- a/galaxy/main/migrations/0100_notifications.py
+++ b/galaxy/main/migrations/0100_notifications.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 
diff --git a/galaxy/main/migrations/0101_remove_importtask_repository_alt_name.py b/galaxy/main/migrations/0101_remove_importtask_repository_alt_name.py
index 89ff0a605..bc2683be3 100644
--- a/galaxy/main/migrations/0101_remove_importtask_repository_alt_name.py
+++ b/galaxy/main/migrations/0101_remove_importtask_repository_alt_name.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-24 12:10
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0102_provider_download_url.py b/galaxy/main/migrations/0102_provider_download_url.py
index c62700c1a..258ac4938 100644
--- a/galaxy/main/migrations/0102_provider_download_url.py
+++ b/galaxy/main/migrations/0102_provider_download_url.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 GITHUB_DOWNLOAD_URL = (
diff --git a/galaxy/main/migrations/0103_repository_download_count.py b/galaxy/main/migrations/0103_repository_download_count.py
index f63ee3f20..20b6c45c7 100644
--- a/galaxy/main/migrations/0103_repository_download_count.py
+++ b/galaxy/main/migrations/0103_repository_download_count.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-29 10:09
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 UPGRADE_REPOSITORY_DOWNLOAD_COUNTS = """
diff --git a/galaxy/main/migrations/0104_repository_version.py b/galaxy/main/migrations/0104_repository_version.py
index 948200d53..9285bbd6c 100644
--- a/galaxy/main/migrations/0104_repository_version.py
+++ b/galaxy/main/migrations/0104_repository_version.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-31 13:18
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import galaxy.main.fields
 
diff --git a/galaxy/main/migrations/0105_content_block_update.py b/galaxy/main/migrations/0105_content_block_update.py
index 08c4a5180..6d0c1d00f 100644
--- a/galaxy/main/migrations/0105_content_block_update.py
+++ b/galaxy/main/migrations/0105_content_block_update.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0106_readme_on_delete.py b/galaxy/main/migrations/0106_readme_on_delete.py
index 5ca72d3c7..dd37afd45 100644
--- a/galaxy/main/migrations/0106_readme_on_delete.py
+++ b/galaxy/main/migrations/0106_readme_on_delete.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import django.db.models.deletion
 
diff --git a/galaxy/main/migrations/0107_cloud_platforms.py b/galaxy/main/migrations/0107_cloud_platforms.py
index dcb5c17cc..578cc13b2 100644
--- a/galaxy/main/migrations/0107_cloud_platforms.py
+++ b/galaxy/main/migrations/0107_cloud_platforms.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0108_sanitize_namespace_names.py b/galaxy/main/migrations/0108_sanitize_namespace_names.py
index 557fea316..625e538a9 100644
--- a/galaxy/main/migrations/0108_sanitize_namespace_names.py
+++ b/galaxy/main/migrations/0108_sanitize_namespace_names.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-05-31 13:18
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 REPLACE_DASH_WITH_UNDERSCORE = """
diff --git a/galaxy/main/migrations/0109_auto_20180626_1050.py b/galaxy/main/migrations/0109_auto_20180626_1050.py
index f9eff0176..87fa5cdbc 100644
--- a/galaxy/main/migrations/0109_auto_20180626_1050.py
+++ b/galaxy/main/migrations/0109_auto_20180626_1050.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.13 on 2018-06-26 14:50
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0110_revert_sanitize_namespace_names.py b/galaxy/main/migrations/0110_revert_sanitize_namespace_names.py
index ccc527b7c..b1e6f88bb 100644
--- a/galaxy/main/migrations/0110_revert_sanitize_namespace_names.py
+++ b/galaxy/main/migrations/0110_revert_sanitize_namespace_names.py
@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 REVERT_SANITIZE_NAMESPACE_NAMES = """
diff --git a/galaxy/main/migrations/0111_repository_deprecated.py b/galaxy/main/migrations/0111_repository_deprecated.py
index 61d5f4d27..e944b80e7 100644
--- a/galaxy/main/migrations/0111_repository_deprecated.py
+++ b/galaxy/main/migrations/0111_repository_deprecated.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.14 on 2018-08-07 19:55
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0112_auto_20180817_0950.py b/galaxy/main/migrations/0112_auto_20180817_0950.py
index 655dd8050..2ac28d7e1 100644
--- a/galaxy/main/migrations/0112_auto_20180817_0950.py
+++ b/galaxy/main/migrations/0112_auto_20180817_0950.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-08-17 13:50
-from __future__ import unicode_literals
-
 from django.conf import settings
 import django.core.validators
 from django.db import migrations, models
@@ -76,6 +72,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='communitysurvey',
-            unique_together=set([('user', 'repository')]),
+            unique_together={('user', 'repository')},
         ),
     ]
diff --git a/galaxy/main/migrations/0113_repository_community_score.py b/galaxy/main/migrations/0113_repository_community_score.py
index c0ec56a8e..019d60d93 100644
--- a/galaxy/main/migrations/0113_repository_community_score.py
+++ b/galaxy/main/migrations/0113_repository_community_score.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-08-20 18:42
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0114_content_type.py b/galaxy/main/migrations/0114_content_type.py
index 1bed3dbfb..29e7206f0 100644
--- a/galaxy/main/migrations/0114_content_type.py
+++ b/galaxy/main/migrations/0114_content_type.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0115_content_scoring_20180918_1506.py b/galaxy/main/migrations/0115_content_scoring_20180918_1506.py
index d56e92749..f879369ef 100644
--- a/galaxy/main/migrations/0115_content_scoring_20180918_1506.py
+++ b/galaxy/main/migrations/0115_content_scoring_20180918_1506.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-18 19:06
-from __future__ import unicode_literals
-
 import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
@@ -156,6 +152,6 @@ class Migration(migrations.Migration):
         ),
         migrations.AlterUniqueTogether(
             name='contentrule',
-            unique_together=set([('rule_id', 'linter_id')]),
+            unique_together={('rule_id', 'linter_id')},
         ),
     ]
diff --git a/galaxy/main/migrations/0116_set_contentrule_values_20180918_1509.py b/galaxy/main/migrations/0116_set_contentrule_values_20180918_1509.py
index 8ecf5eda5..b1cd4ec5e 100644
--- a/galaxy/main/migrations/0116_set_contentrule_values_20180918_1509.py
+++ b/galaxy/main/migrations/0116_set_contentrule_values_20180918_1509.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-17 22:01
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 
diff --git a/galaxy/main/migrations/0117_namespace_search_index.py b/galaxy/main/migrations/0117_namespace_search_index.py
index e3cc0f51e..8e7fb62e8 100644
--- a/galaxy/main/migrations/0117_namespace_search_index.py
+++ b/galaxy/main/migrations/0117_namespace_search_index.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 DROP_SEARCH_VECTOR_UPDATE_TRIGGER = """
diff --git a/galaxy/main/migrations/0118_influxsessionidentifier.py b/galaxy/main/migrations/0118_influxsessionidentifier.py
index fae708f9f..be0f9e2d3 100644
--- a/galaxy/main/migrations/0118_influxsessionidentifier.py
+++ b/galaxy/main/migrations/0118_influxsessionidentifier.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-24 18:24
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 import galaxy.main.mixins
 import uuid
diff --git a/galaxy/main/migrations/0119_scoring_edits_remove_contentrule.py b/galaxy/main/migrations/0119_scoring_edits_remove_contentrule.py
index 12992c137..fe2fdc162 100644
--- a/galaxy/main/migrations/0119_scoring_edits_remove_contentrule.py
+++ b/galaxy/main/migrations/0119_scoring_edits_remove_contentrule.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-09-25 19:35
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0120_repository_quality_score_date.py b/galaxy/main/migrations/0120_repository_quality_score_date.py
index 6d431d0f7..741298f89 100644
--- a/galaxy/main/migrations/0120_repository_quality_score_date.py
+++ b/galaxy/main/migrations/0120_repository_quality_score_date.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-11 15:53
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0121_userpreferences.py b/galaxy/main/migrations/0121_userpreferences.py
index 95e6783ae..5a9f19909 100644
--- a/galaxy/main/migrations/0121_userpreferences.py
+++ b/galaxy/main/migrations/0121_userpreferences.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.16 on 2018-10-19 14:24
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.contrib.postgres import fields as psql_fields
 from django.db import migrations, models
diff --git a/galaxy/main/migrations/0122_auto_20181015_1802.py b/galaxy/main/migrations/0122_auto_20181015_1802.py
index 2121854bc..3a1e11f4d 100644
--- a/galaxy/main/migrations/0122_auto_20181015_1802.py
+++ b/galaxy/main/migrations/0122_auto_20181015_1802.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.15 on 2018-10-15 22:02
-from __future__ import unicode_literals
-
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
diff --git a/galaxy/main/migrations/0123_fix_importtaskmessage_constraints.py b/galaxy/main/migrations/0123_fix_importtaskmessage_constraints.py
index 0642fa3b9..77da91b22 100644
--- a/galaxy/main/migrations/0123_fix_importtaskmessage_constraints.py
+++ b/galaxy/main/migrations/0123_fix_importtaskmessage_constraints.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2018-12-13 13:47
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 
diff --git a/galaxy/main/migrations/0124_auto_20181210_1433.py b/galaxy/main/migrations/0124_auto_20181210_1433.py
index a1f381dd4..f3932227d 100644
--- a/galaxy/main/migrations/0124_auto_20181210_1433.py
+++ b/galaxy/main/migrations/0124_auto_20181210_1433.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2018-12-10 19:33
-from __future__ import unicode_literals
-
 from django.db import migrations, models
 
 SET_COMMUNITY_SURVEY_COUNT = """
diff --git a/galaxy/main/migrations/0125_community_score_question_average.py b/galaxy/main/migrations/0125_community_score_question_average.py
index 8316ea711..1b747539d 100644
--- a/galaxy/main/migrations/0125_community_score_question_average.py
+++ b/galaxy/main/migrations/0125_community_score_question_average.py
@@ -1,7 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.17 on 2018-12-10 19:33
-from __future__ import unicode_literals
-
 from django.db import migrations
 
 SET_COMMUNITY_SCORE_TO_QUESTION_AVERAGE = """
diff --git a/galaxy/main/migrations/0126_notification_commit_message.py b/galaxy/main/migrations/0126_notification_commit_message.py
index 3422b8153..93bda5bb7 100644
--- a/galaxy/main/migrations/0126_notification_commit_message.py
+++ b/galaxy/main/migrations/0126_notification_commit_message.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 2.1.5 on 2019-01-31 18:31
-
 from django.db import migrations
 import galaxy.main.fields
 
diff --git a/galaxy/main/migrations/0129_collection_quality_score_updates.py b/galaxy/main/migrations/0129_collection_quality_score_updates.py
index e2ff2efa1..f30ee236f 100644
--- a/galaxy/main/migrations/0129_collection_quality_score_updates.py
+++ b/galaxy/main/migrations/0129_collection_quality_score_updates.py
@@ -1,5 +1,3 @@
-# Generated by Django 2.1.7 on 2019-03-05 16:53
-
 import django.core.validators
 from django.db import migrations, models
 
diff --git a/galaxy/main/migrations/0130_move_collection_quality_score.py b/galaxy/main/migrations/0130_move_collection_quality_score.py
index ed09b7e52..6788aca89 100644
--- a/galaxy/main/migrations/0130_move_collection_quality_score.py
+++ b/galaxy/main/migrations/0130_move_collection_quality_score.py
@@ -1,5 +1,3 @@
-# Generated by Django 2.1.7 on 2019-03-11 16:11
-
 import django.core.validators
 from django.db import migrations, models
 
diff --git a/galaxy/main/migrations/0131_import_task_collection_support.py b/galaxy/main/migrations/0131_import_task_collection_support.py
index d1e91bd5b..e834f3c99 100644
--- a/galaxy/main/migrations/0131_import_task_collection_support.py
+++ b/galaxy/main/migrations/0131_import_task_collection_support.py
@@ -1,5 +1,3 @@
-# Generated by Django 2.1.7 on 2019-03-14 14:03
-
 from django.db import migrations, models
 import django.db.models.deletion
 
diff --git a/galaxy/main/tests/__init__.py b/galaxy/main/tests/__init__.py
index de02ebce1..81c39a4be 100644
--- a/galaxy/main/tests/__init__.py
+++ b/galaxy/main/tests/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_cloud_platform_model.py b/galaxy/main/tests/test_cloud_platform_model.py
index a7dee2286..41487f521 100644
--- a/galaxy/main/tests/test_cloud_platform_model.py
+++ b/galaxy/main/tests/test_cloud_platform_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_content_block_model.py b/galaxy/main/tests/test_content_block_model.py
index 9c7ec3dd8..020d38042 100644
--- a/galaxy/main/tests/test_content_block_model.py
+++ b/galaxy/main/tests/test_content_block_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_content_type_model.py b/galaxy/main/tests/test_content_type_model.py
index 92038ed6e..22e436843 100644
--- a/galaxy/main/tests/test_content_type_model.py
+++ b/galaxy/main/tests/test_content_type_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_platform_model.py b/galaxy/main/tests/test_platform_model.py
index 7e6221fdc..dd21a8a1d 100644
--- a/galaxy/main/tests/test_platform_model.py
+++ b/galaxy/main/tests/test_platform_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_provider_model.py b/galaxy/main/tests/test_provider_model.py
index 03251dd12..012975a0a 100644
--- a/galaxy/main/tests/test_provider_model.py
+++ b/galaxy/main/tests/test_provider_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_subscription_model.py b/galaxy/main/tests/test_subscription_model.py
index 7677f69fe..a1ca72ab8 100644
--- a/galaxy/main/tests/test_subscription_model.py
+++ b/galaxy/main/tests/test_subscription_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_tag_model.py b/galaxy/main/tests/test_tag_model.py
index c8e730c53..cc5d9e211 100644
--- a/galaxy/main/tests/test_tag_model.py
+++ b/galaxy/main/tests/test_tag_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/main/tests/test_user_alias_model.py b/galaxy/main/tests/test_user_alias_model.py
index d1344ce09..c4ab472bc 100644
--- a/galaxy/main/tests/test_user_alias_model.py
+++ b/galaxy/main/tests/test_user_alias_model.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # (c) 2012-2018, Ansible
 #
 # This file is part of Ansible Galaxy
diff --git a/galaxy/worker/importers/role.py b/galaxy/worker/importers/role.py
index d076c5930..55ec4f403 100644
--- a/galaxy/worker/importers/role.py
+++ b/galaxy/worker/importers/role.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 from galaxy import common
 from galaxy import constants
 from galaxy.main import models
diff --git a/galaxy/worker/tasks.py b/galaxy/worker/tasks.py
index b18e7f8b8..c1676e461 100644
--- a/galaxy/worker/tasks.py
+++ b/galaxy/worker/tasks.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 import logging
 
 import celery
diff --git a/galaxy/worker/tasks/repository.py b/galaxy/worker/tasks/repository.py
index 9def7bc3f..78444eaa4 100644
--- a/galaxy/worker/tasks/repository.py
+++ b/galaxy/worker/tasks/repository.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 import logging
 
 import celery
diff --git a/galaxy/worker/utils.py b/galaxy/worker/utils.py
index 204b8eeaf..df59d8ad1 100644
--- a/galaxy/worker/utils.py
+++ b/galaxy/worker/utils.py
@@ -15,8 +15,6 @@
 # You should have received a copy of the Apache License
 # along with Galaxy.  If not, see <http://www.apache.org/licenses/>.
 
-from __future__ import absolute_import
-
 import semantic_version
 import six
 
diff --git a/update-authors.py b/update-authors.py
index 62a6d1239..5c75a6008 100755
--- a/update-authors.py
+++ b/update-authors.py
@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from __future__ import absolute_import, print_function, unicode_literals
 
 import re
 import subprocess