diff --git a/DiscordChatExporter.Core/Discord/Data/Attachment.cs b/DiscordChatExporter.Core/Discord/Data/Attachment.cs
index 1a3e0de5..2bd0c4f1 100644
--- a/DiscordChatExporter.Core/Discord/Data/Attachment.cs
+++ b/DiscordChatExporter.Core/Discord/Data/Attachment.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text.Json;
 using DiscordChatExporter.Core.Discord.Data.Common;
-using DiscordChatExporter.Core.Utils;
 using DiscordChatExporter.Core.Utils.Extensions;
 using JsonExtensions.Reading;
 
@@ -20,11 +19,26 @@ public partial record Attachment(
 {
     public string FileExtension => Path.GetExtension(FileName);
 
-    public bool IsImage => FileFormat.IsImage(FileExtension);
+    public bool IsImage =>
+        string.Equals(FileExtension, ".jpg", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".jpeg", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".png", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".gif", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".bmp", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".webp", StringComparison.OrdinalIgnoreCase);
 
-    public bool IsVideo => FileFormat.IsVideo(FileExtension);
+    public bool IsVideo =>
+        string.Equals(FileExtension, ".gifv", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".mp4", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".webm", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".mov", StringComparison.OrdinalIgnoreCase);
 
-    public bool IsAudio => FileFormat.IsAudio(FileExtension);
+    public bool IsAudio =>
+        string.Equals(FileExtension, ".mp3", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".wav", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".ogg", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".flac", StringComparison.OrdinalIgnoreCase) ||
+        string.Equals(FileExtension, ".m4a", StringComparison.OrdinalIgnoreCase);
 
     public bool IsSpoiler => FileName.StartsWith("SPOILER_", StringComparison.Ordinal);
 }
diff --git a/DiscordChatExporter.Core/Utils/FileFormat.cs b/DiscordChatExporter.Core/Utils/FileFormat.cs
deleted file mode 100644
index a19ec8b6..00000000
--- a/DiscordChatExporter.Core/Utils/FileFormat.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace DiscordChatExporter.Core.Utils;
-
-public static class FileFormat
-{
-    private static readonly HashSet<string> ImageExtensions = new(StringComparer.OrdinalIgnoreCase)
-    {
-        ".jpg",
-        ".jpeg",
-        ".png",
-        ".gif",
-        ".gifv",
-        ".bmp",
-        ".webp"
-    };
-
-    public static bool IsImage(string format) => ImageExtensions.Contains(format);
-
-    private static readonly HashSet<string> VideoExtensions = new(StringComparer.OrdinalIgnoreCase)
-    {
-        ".mp4",
-        ".webm",
-        ".mov"
-    };
-
-    public static bool IsVideo(string format) => VideoExtensions.Contains(format);
-
-    private static readonly HashSet<string> AudioExtensions = new(StringComparer.OrdinalIgnoreCase)
-    {
-        ".mp3",
-        ".wav",
-        ".ogg",
-        ".flac",
-        ".m4a"
-    };
-
-    public static bool IsAudio(string format) => AudioExtensions.Contains(format);
-}
\ No newline at end of file