diff --git a/Constants/DirectoryPaths.cs b/Constants/DirectoryPaths.cs
index d23e749..37d96c4 100644
--- a/Constants/DirectoryPaths.cs
+++ b/Constants/DirectoryPaths.cs
@@ -2,11 +2,7 @@ namespace Icarus.Constants;
 
 public class DirectoryPaths
 {
-    // TODO: Remove this
-    public static string CoverArtPath =>
-        Directory.GetCurrentDirectory() + "/Images/Stock/CoverArt.png";
-    public static string CoverArtDirectory =>
-        Directory.GetCurrentDirectory() + "/Images/Stock/";
+    public static string CoverArtDirectory => Directory.GetCurrentDirectory() + "/Images/Stock/";
     public static string CoverArtFilename => "CoverArt.png";
     public static string FILENAME_CHARACTERS = "ABCDEF0123456789";
     public static int FILENAME_LENGTH = 25;
diff --git a/Controllers/Managers/CoverArtManager.cs b/Controllers/Managers/CoverArtManager.cs
index 7caa8ee..dbd259d 100644
--- a/Controllers/Managers/CoverArtManager.cs
+++ b/Controllers/Managers/CoverArtManager.cs
@@ -82,9 +82,6 @@ public class CoverArtManager : BaseManager
             };
 
             var segment = coverArt.GenerateFilename(0);
-            // var imagePath = dirMgr.SongDirectory + segment + defaultExtension;
-
-            // coverArt.ImagePath = imagePath;
             coverArt.Directory = dirMgr.SongDirectory;
             coverArt.Filename = segment + defaultExtension;
 
@@ -101,13 +98,11 @@ public class CoverArtManager : BaseManager
                 _logger.Info("Song has no cover art, applying stock cover art");
 
                 var coverArtFilePath = _rootCoverArtPath + $"{segment}{defaultExtension}";
-                // coverArt.ImagePath = DirectoryPaths.CoverArtPath;
                 coverArt.Directory = DirectoryPaths.CoverArtDirectory;
                 coverArt.Filename = DirectoryPaths.CoverArtFilename;
                 metaData.UpdateCoverArt(song, coverArt);
                 coverArt.Directory = this._rootCoverArtPath;
                 coverArt.Filename = $"{segment}{defaultExtension}";
-                // coverArt.ImagePath = coverArtFilePath;
                 File.WriteAllBytes(coverArt.ImagePath(), _stockCoverArt);
             }
 
@@ -130,8 +125,6 @@ public class CoverArtManager : BaseManager
         return null;
     }
 
-    // TODO: Create emthods to save the cover art to a temporary location
-    // to get the type of the cover art.
     public CoverArt SaveCoverArt(IFormFile data, Song song)
     {
         var cover = new CoverArt { SongTitle = song.Title };
@@ -140,7 +133,8 @@ public class CoverArtManager : BaseManager
         {
             MetadataRetriever metaData = new MetadataRetriever();
             var dirMgr = new DirectoryManager(_rootCoverArtPath);
-            var defaultExtension = "." + metaData.FileExtensionType(data);
+            cover.Type = metaData.FileExtensionType(data);
+            var defaultExtension = "." + cover.Type;
             dirMgr.CreateDirectory(song);
 
             var segment = cover.GenerateFilename(0);
@@ -148,7 +142,6 @@ public class CoverArtManager : BaseManager
 
             cover.Directory = dirMgr.SongDirectory;
             cover.Filename = segment + defaultExtension;
-            // cover.ImagePath = imagePath;
 
             using (var fileStream = new FileStream(cover.ImagePath(), FileMode.Create))
             {
@@ -171,9 +164,10 @@ public class CoverArtManager : BaseManager
     private void Initialize()
     {
         _coverArtContext = new CoverArtContext(_connectionString);
+        var path = DirectoryPaths.CoverArtDirectory + DirectoryPaths.CoverArtFilename;
 
-        if (System.IO.File.Exists(DirectoryPaths.CoverArtPath))
-            _stockCoverArt = File.ReadAllBytes(DirectoryPaths.CoverArtPath);
+        if (System.IO.File.Exists(path))
+            _stockCoverArt = File.ReadAllBytes(path);
 
         if (!File.Exists(_rootCoverArtPath + "CoverArt.png"))
         {
diff --git a/Controllers/Managers/SongManager.cs b/Controllers/Managers/SongManager.cs
index ecea25f..8234e06 100644
--- a/Controllers/Managers/SongManager.cs
+++ b/Controllers/Managers/SongManager.cs
@@ -232,15 +232,6 @@ public class SongManager : BaseManager
         var coverMgr = new CoverArtManager(_config);
         var coverArt = coverMgr.SaveCoverArt(coverArtData, song);
 
-        MetadataRetriever metaData = new MetadataRetriever();
-        coverArt.Type = metaData.CoverArtFileExtensionType(coverArt);
-        if (string.IsNullOrEmpty(coverArt.Type))
-        {
-            Console.WriteLine("File type is empty");
-            Console.WriteLine($"Directory: {coverArt.Directory}");
-            Console.WriteLine($"Filename: {coverArt.Filename}");
-        }
-
         DirectoryManager dirMgr = new DirectoryManager(_config, song);
         dirMgr.CreateDirectory();
 
diff --git a/Controllers/Utilities/MetadataRetriever.cs b/Controllers/Utilities/MetadataRetriever.cs
index 2ab0d29..ee15437 100644
--- a/Controllers/Utilities/MetadataRetriever.cs
+++ b/Controllers/Utilities/MetadataRetriever.cs
@@ -82,13 +82,8 @@ public class MetadataRetriever
                 return string.Empty;
             }
 
-
             var fileType = FileTypeChecker.FileTypeValidator.GetFileType(fileStream);
-            // Console.WriteLine("Type Name: {0}", fileType.Name);
-            // Console.WriteLine("Type Extension: {0}", fileType.Extension);
-            // Console.WriteLine("Is Image?: {0}", fileStream.IsImage());
-            // Console.WriteLine("Is Bitmap?: {0}", fileStream.Is<Bitmap>());
-            //
+
             Console.WriteLine($"Filetype: {fileType}");
 
             return fileType.Extension;