diff --git a/Controllers/Managers/DirectoryManager.cs b/Controllers/Managers/DirectoryManager.cs
index acf14fb..5994122 100644
--- a/Controllers/Managers/DirectoryManager.cs
+++ b/Controllers/Managers/DirectoryManager.cs
@@ -141,7 +141,7 @@ namespace Icarus.Controllers.Managers
 
             return artistPath;
         }
-        //TODO: Change this so the song's metadata is not being used
+
         public string GenerateSongPath(Song song)
         {
             _logger.Info("Generating song path");
diff --git a/Controllers/Managers/SongManager.cs b/Controllers/Managers/SongManager.cs
index a4b8e64..c6389d4 100644
--- a/Controllers/Managers/SongManager.cs
+++ b/Controllers/Managers/SongManager.cs
@@ -232,7 +232,7 @@ namespace Icarus.Controllers.Managers
 
             var meta = new MetadataRetriever();
             song.Duration = meta.RetrieveSongDuration(song.SongPath());
-            // const int trackCount = meta.RetrieveTrackCount(song.)
+
             meta.UpdateMetadata(song, song);
             meta.UpdateCoverArt(song, coverArt);
 
diff --git a/Controllers/v1/SongDataController.cs b/Controllers/v1/SongDataController.cs
index 9837390..8b66acc 100644
--- a/Controllers/v1/SongDataController.cs
+++ b/Controllers/v1/SongDataController.cs
@@ -164,6 +164,7 @@ namespace Icarus.Controllers.V1
             {
                 [FromForm(Name = "file")]
                 public IFormFile SongData { get; set; }
+                // TODO: Think about making this optional and if it is not provided, use the stock cover art
                 [FromForm(Name = "cover")]
                 public IFormFile CoverArtData { get; set; }
                 [FromForm(Name = "metadata")]
diff --git a/Program.cs b/Program.cs
index 9b3d5bb..c0c954b 100644
--- a/Program.cs
+++ b/Program.cs
@@ -37,7 +37,6 @@ namespace Icarus
         }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
-            // TODO: Need to add Logging support and maybe adding CLI port support
             Host.CreateDefaultBuilder(args)
                 .ConfigureWebHostDefaults(webBuilder =>
                 {