diff --git a/app/src/main/java/com/example/mear/management/TrackManager.kt b/app/src/main/java/com/example/mear/management/TrackManager.kt
index 71a071a..4858efa 100644
--- a/app/src/main/java/com/example/mear/management/TrackManager.kt
+++ b/app/src/main/java/com/example/mear/management/TrackManager.kt
@@ -66,6 +66,7 @@ class TrackManager(var allSongPath: MutableList<String>) {
 
         if (moreSongs) {
             GlobalScope.launch {
+                // TODO: Implement multiple coroutines to add tracks to the data structure
                 val remainingTracks = remainingTracks()
                 addToDatabase(remainingTracks)
                 allTracksAdded = true
diff --git a/app/src/main/java/com/example/mear/playback/service/MusicService.kt b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
index d69fef2..6182fba 100644
--- a/app/src/main/java/com/example/mear/playback/service/MusicService.kt
+++ b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
@@ -132,7 +132,6 @@ class MusicService: Service() {
             trackPlayer!!.reset()
             shuffleOn = retrieveShuffleMode()
             var nextTrack = fetchSongIndex(PlayTypes.PlayNextSong)
-            val allTracks = TrackRepository(this).getAll()
             currentTrack = TrackRepository(this).getTrack(nextTrack)
             trackPlayer!!.setDataSource(currentTrack.songPath)
             trackPlayer!!.prepare()