diff --git a/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt b/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt
index 259fb5816..6f0075afb 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/MusicViewModel.kt
@@ -114,7 +114,6 @@ class MusicViewModel @Inject constructor(private val musicRepository: MusicRepos
      * @param songs The [Song]s to be contained in the new playlist.
      */
     fun createPlaylist(name: String, songs: List<Song> = listOf()) {
-        // TODO: Default to something like "Playlist 1", "Playlist 2", etc.
         // TODO: Attempt to unify playlist creation flow with dialog model
         _pendingNewPlaylist.put(PendingName.Args(name, songs.map { it.uid }))
     }
diff --git a/app/src/test/java/org/oxycblt/auxio/music/device/DeviceMusicImplTest.kt b/app/src/test/java/org/oxycblt/auxio/music/device/DeviceMusicImplTest.kt
index 77076670d..9227b93bf 100644
--- a/app/src/test/java/org/oxycblt/auxio/music/device/DeviceMusicImplTest.kt
+++ b/app/src/test/java/org/oxycblt/auxio/music/device/DeviceMusicImplTest.kt
@@ -19,38 +19,10 @@
 package org.oxycblt.auxio.music.device
 
 import java.util.*
-import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.Test
-import org.oxycblt.auxio.music.Music
-import org.oxycblt.auxio.music.MusicMode
-import org.oxycblt.auxio.music.info.Date
 
 class DeviceMusicImplTest {
-    @Test
-    fun musicUid_auxio() {
-        val uid =
-            createHashedUid(MusicMode.SONGS) {
-                update("Wheel")
-                update(listOf("Parannoul", "Asian Glow"))
-                update("Paraglow")
-                update(null as String?)
-                update(Date.from(2022))
-                update(4 as Int?)
-                update(null as Int?)
-            }
-
-        assertEquals("org.oxycblt.auxio:a10b-3d29c202-cd52-fbe0-4714-47cd07f07a59", uid.toString())
-    }
-
-    @Test
-    fun musicUid_musicBrainz() {
-        val uid =
-            Music.UID.musicBrainz(
-                MusicMode.ALBUMS, UUID.fromString("9b3b0695-0cdc-4560-8486-8deadee136cb"))
-        assertEquals("org.musicbrainz:a10a-9b3b0695-0cdc-4560-8486-8deadee136cb", uid.toString())
-    }
-
     @Test
     fun albumRaw_equals_inconsistentCase() {
         val a =