diff --git a/cms/djangoapps/xblock_config/apps.py b/cms/djangoapps/xblock_config/apps.py
index c5888443a2..c908cd0930 100644
--- a/cms/djangoapps/xblock_config/apps.py
+++ b/cms/djangoapps/xblock_config/apps.py
@@ -13,8 +13,8 @@ class XBlockConfig(AppConfig):
     """
     Default configuration for the "xblock_config" Django application.
     """
-    name = u'cms.djangoapps.xblock_config'
-    verbose_name = u'XBlock Configuration'
+    name = 'cms.djangoapps.xblock_config'
+    verbose_name = 'XBlock Configuration'
 
     def ready(self):
         from openedx.core.lib.xblock_utils import xblock_local_resource_url
diff --git a/cms/djangoapps/xblock_config/forms.py b/cms/djangoapps/xblock_config/forms.py
index c8635e15cb..7f2a817239 100644
--- a/cms/djangoapps/xblock_config/forms.py
+++ b/cms/djangoapps/xblock_config/forms.py
@@ -18,7 +18,7 @@ class CourseEditLTIFieldsEnabledAdminForm(forms.ModelForm):
     Form for LTI consumer course-specific configuration to verify the course id.
     """
 
-    class Meta(object):
+    class Meta:
         model = CourseEditLTIFieldsEnabledFlag
         fields = '__all__'
 
diff --git a/cms/djangoapps/xblock_config/migrations/0001_initial.py b/cms/djangoapps/xblock_config/migrations/0001_initial.py
index f9a64bdbb3..02085021da 100644
--- a/cms/djangoapps/xblock_config/migrations/0001_initial.py
+++ b/cms/djangoapps/xblock_config/migrations/0001_initial.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
diff --git a/cms/djangoapps/xblock_config/migrations/0002_courseeditltifieldsenabledflag.py b/cms/djangoapps/xblock_config/migrations/0002_courseeditltifieldsenabledflag.py
index c2acbfcbf8..ef9aecb0d6 100644
--- a/cms/djangoapps/xblock_config/migrations/0002_courseeditltifieldsenabledflag.py
+++ b/cms/djangoapps/xblock_config/migrations/0002_courseeditltifieldsenabledflag.py
@@ -1,6 +1,3 @@
-# -*- coding: utf-8 -*-
-
-
 import django.db.models.deletion
 from django.conf import settings
 from django.db import migrations, models
diff --git a/cms/djangoapps/xblock_config/models.py b/cms/djangoapps/xblock_config/models.py
index 630210dfc5..7a44adeef6 100644
--- a/cms/djangoapps/xblock_config/models.py
+++ b/cms/djangoapps/xblock_config/models.py
@@ -4,9 +4,6 @@ Models used by Studio XBlock infrastructure.
 Includes:
     StudioConfig: A ConfigurationModel for managing Studio.
 """
-
-
-import six
 from config_models.models import ConfigurationModel
 from django.db.models import TextField
 from django.utils.encoding import python_2_unicode_compatible
@@ -22,8 +19,8 @@ class StudioConfig(ConfigurationModel):
     .. no_pii:
     """
     disabled_blocks = TextField(
-        default=u"about course_info static_tab",
-        help_text=u"Space-separated list of XBlocks on which XBlockAsides should never render in studio",
+        default="about course_info static_tab",
+        help_text="Space-separated list of XBlocks on which XBlockAsides should never render in studio",
     )
 
     @classmethod
@@ -83,7 +80,7 @@ class CourseEditLTIFieldsEnabledFlag(ConfigurationModel):
         if self.enabled:
             en = ""
 
-        return u"Course '{course_id}': Edit LTI access to Learner information {en}Enabled".format(
-            course_id=six.text_type(self.course_id),
+        return "Course '{course_id}': Edit LTI access to Learner information {en}Enabled".format(
+            course_id=str(self.course_id),
             en=en,
         )
diff --git a/cms/djangoapps/xblock_config/tests/test_models.py b/cms/djangoapps/xblock_config/tests/test_models.py
index 7b6c4db288..bd2448d85b 100644
--- a/cms/djangoapps/xblock_config/tests/test_models.py
+++ b/cms/djangoapps/xblock_config/tests/test_models.py
@@ -34,7 +34,7 @@ class TestLTIConsumerHideFieldsFlag(TestCase):
     These are set via Django admin settings.
     """
     def setUp(self):
-        super(TestLTIConsumerHideFieldsFlag, self).setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        super().setUp()
         self.course_id = CourseLocator(org="edx", course="course", run="run")
 
     @ddt.data(