diff --git a/beets/autotag/__init__.py b/beets/autotag/__init__.py
index a820535cb..4c5f09eb4 100644
--- a/beets/autotag/__init__.py
+++ b/beets/autotag/__init__.py
@@ -53,8 +53,6 @@ def apply_item_metadata(item, track_info):
         item.composer_sort = track_info.composer_sort
     if track_info.arranger is not None:
         item.arranger = track_info.arranger
-    
-    
 
     # At the moment, the other metadata is left intact (including album
     # and track number). Perhaps these should be emptied?
diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
index 0c3f78ad3..053d050c6 100644
--- a/beets/autotag/hooks.py
+++ b/beets/autotag/hooks.py
@@ -156,7 +156,7 @@ class TrackInfo(object):
                  length=None, index=None, medium=None, medium_index=None,
                  medium_total=None, artist_sort=None, disctitle=None,
                  artist_credit=None, data_source=None, data_url=None,
-                 media=None, lyricist=None, composer=None, composer_sort=None, 
+                 media=None, lyricist=None, composer=None, composer_sort=None,
                  arranger=None, track_alt=None):
         self.title = title
         self.track_id = track_id
diff --git a/beets/mediafile.py b/beets/mediafile.py
index e5e7af3ec..9f37b70d5 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -1632,28 +1632,24 @@ class MediaFile(object):
         StorageStyle('LYRICIST'),
         ASFStorageStyle('WM/Writer'),
     )
-    
     composer = MediaField(
         MP3StorageStyle('TCOM'),
         MP4StorageStyle('\xa9wrt'),
         StorageStyle('COMPOSER'),
         ASFStorageStyle('WM/Composer'),
     )
-    
     composer_sort = MediaField(
         MP3StorageStyle('TSOC'),
         MP4StorageStyle('soco'),
         StorageStyle('COMPOSERSORT'),
         ASFStorageStyle('WM/Composersortorder'),
     )
-    
     arranger = MediaField(
         MP3PeopleStorageStyle('TIPL', involvement='arranger'),
         MP4StorageStyle('----:com.apple.iTunes:Arranger'),
         StorageStyle('ARRANGER'),
         ASFStorageStyle('beets/Arranger'),
     )
-
     grouping = MediaField(
         MP3StorageStyle('TIT1'),
         MP4StorageStyle('\xa9grp'),
diff --git a/test/test_mediafile.py b/test/test_mediafile.py
index 179999dc6..961d3d3bd 100644
--- a/test/test_mediafile.py
+++ b/test/test_mediafile.py
@@ -141,12 +141,6 @@ class ImageStructureTestMixin(ArtTestMixin):
                       type=ImageType.composer)
         mediafile.images += [image]
         mediafile.save()
-        
-        image = Image(data=self.png_data, desc=u'the sortname of the composer',
-                      type=ImageType.composer_sort)
-        mediafile.images += [image]
-        mediafile.save()
-        
 
         mediafile = MediaFile(mediafile.path)
         self.assertEqual(len(mediafile.images), 3)
@@ -156,12 +150,6 @@ class ImageStructureTestMixin(ArtTestMixin):
         self.assertExtendedImageAttributes(
             image, desc=u'the composer', type=ImageType.composer
         )
-        
-        images = (i for i in mediafile.images if i.desc == u'the sortname of the composer')
-        image = next(images, None)
-        self.assertExtendedImageAttributes(
-            image, desc=u'the sortname of the composer', type=ImageType.composer_sort
-        )
 
     def test_delete_image_structures(self):
         mediafile = self._mediafile_fixture('image')
@@ -205,11 +193,6 @@ class ExtendedImageStructureTestMixin(ImageStructureTestMixin):
                       type=ImageType.composer)
         mediafile.images += [image]
         mediafile.save()
-        
-        image = Image(data=self.tiff_data, desc=u'the sortname of the composer',
-                      type=ImageType.composer_sort)
-        mediafile.images += [image]
-        mediafile.save()
 
         mediafile = MediaFile(mediafile.path)
         self.assertEqual(len(mediafile.images), 3)
@@ -219,11 +202,6 @@ class ExtendedImageStructureTestMixin(ImageStructureTestMixin):
                      mediafile.images))[0]
         self.assertExtendedImageAttributes(
             image, desc=u'the composer', type=ImageType.composer)
-            
-        image = list(filter(lambda i: i.mime_type == 'image/tiff',
-                     mediafile.images))[0]
-        self.assertExtendedImageAttributes(
-            image, desc=u'the sortname of the composer', type=ImageType.composer_sort)
 
 
 class LazySaveTestMixin(object):
@@ -345,7 +323,6 @@ class ReadWriteTestBase(ArtTestMixin, GenreListTestMixin,
         'album':         u'the album',
         'genre':         u'the genre',
         'composer':      u'the composer',
-        'composer_sort': u'the sortname of the composer',
         'grouping':      u'the grouping',
         'year':          2001,
         'month':         None,
@@ -373,7 +350,6 @@ class ReadWriteTestBase(ArtTestMixin, GenreListTestMixin,
         'genre',
         'lyricist',
         'composer',
-        'composer_sort',
         'arranger',
         'grouping',
         'year',