diff --git a/app/src/main/java/org/oxycblt/auxio/image/extractor/CoverExtractor.kt b/app/src/main/java/org/oxycblt/auxio/image/extractor/CoverExtractor.kt
index f81ed13fb..395429104 100644
--- a/app/src/main/java/org/oxycblt/auxio/image/extractor/CoverExtractor.kt
+++ b/app/src/main/java/org/oxycblt/auxio/image/extractor/CoverExtractor.kt
@@ -50,7 +50,6 @@ import okio.buffer
 import okio.source
 import org.oxycblt.auxio.image.CoverMode
 import org.oxycblt.auxio.image.ImageSettings
-import org.oxycblt.auxio.list.Sort
 import org.oxycblt.auxio.music.Album
 import org.oxycblt.auxio.music.Song
 import org.oxycblt.auxio.util.logD
@@ -81,8 +80,8 @@ constructor(
         }
     }
 
-    fun computeAlbumOrdering(songs: List<Song>): Collection<Album> =
-        Sort(Sort.Mode.ByCount, Sort.Direction.DESCENDING).albums(songs.groupBy { it.album }.keys)
+    fun computeAlbumOrdering(songs: List<Song>) =
+        songs.groupBy { it.album }.entries.sortedByDescending { it.value.size }.map { it.key }
 
     private suspend fun openInputStream(album: Album): InputStream? =
         try {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt b/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt
index d3fb58323..f13951212 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/picker/RenamePlaylistDialog.kt
@@ -52,6 +52,7 @@ class RenamePlaylistDialog : ViewBindingDialogFragment<DialogPlaylistNameBinding
 
     override fun onConfigDialog(builder: AlertDialog.Builder) {
         builder
+            // TODO:
             .setTitle(R.string.lbl_rename)
             .setPositiveButton(R.string.lbl_ok) { _, _ ->
                 val playlist = unlikelyToBeNull(pickerModel.currentPlaylistToRename.value)