diff --git a/DATFromDir/DATFromDir.cs b/DATFromDir/DATFromDir.cs
index 0c760aad..469c6cd2 100644
--- a/DATFromDir/DATFromDir.cs
+++ b/DATFromDir/DATFromDir.cs
@@ -54,8 +54,6 @@ namespace SabreTools
 			_logger = new Logger(false, "datfromdir.log");
 			_logger.Start();
 
-			Remapping.CreateArchiveFormats();
-
 			// First things first, take care of all of the arguments that this could have
 			_noMD5 = false; _noSHA1 = false; _forceunzip = false; _allfiles = false; _old = false;
 			_name = ""; _desc = ""; _cat = ""; _version = ""; _author = "";
@@ -291,15 +289,20 @@ namespace SabreTools
 			DirectoryInfo di = Directory.CreateDirectory(_tempDir);
 
 			bool encounteredErrors = true;
-			if (!_allfiles && Remapping.ArchiveFormats.Contains(Path.GetExtension(item).ToLowerInvariant()))
+			if (!_allfiles)
 			{
 				try
 				{
 					IArchive archive = ArchiveFactory.Open(item);
-					_logger.Log("Found archive of type: " + archive.Type);
-					IReader reader = archive.ExtractAllEntries();
-					reader.WriteAllToDirectory(_tempDir, ExtractOptions.ExtractFullPath);
-					encounteredErrors = false;
+					ArchiveType at = archive.Type;
+					_logger.Log("Found archive of type: " + at);
+
+					if (at == ArchiveType.Zip || at == ArchiveType.SevenZip || at == ArchiveType.Rar)
+					{
+						IReader reader = archive.ExtractAllEntries();
+						reader.WriteAllToDirectory(_tempDir, ExtractOptions.ExtractFullPath);
+						encounteredErrors = false;
+					}
 				}
 				catch (InvalidOperationException)
 				{
diff --git a/SabreHelper/Remapping.cs b/SabreHelper/Remapping.cs
index 880a41ad..a65256dd 100644
--- a/SabreHelper/Remapping.cs
+++ b/SabreHelper/Remapping.cs
@@ -28,9 +28,6 @@ namespace SabreTools.Helper
 		public static Dictionary<string, int> PCE = new Dictionary<string, int>();
 		public static Dictionary<string, int> SNES = new Dictionary<string, int>();
 
-		// Available archive formats
-		public static List<string> ArchiveFormats = new List<string>();
-
 		/// <summary>
 		/// Create all remappings to be used by the program
 		/// </summary>
@@ -229,12 +226,5 @@ namespace SabreTools.Helper
 				}
 			}
 		}
-
-		public static void CreateArchiveFormats()
-		{
-			ArchiveFormats.Add("7z");
-			ArchiveFormats.Add("zip");
-			ArchiveFormats.Add("rar");
-		}
 	}
 }