diff --git a/SabreTools.Library/DatFiles/DatFile.cs b/SabreTools.Library/DatFiles/DatFile.cs
index eb42c9da..4eb4c726 100644
--- a/SabreTools.Library/DatFiles/DatFile.cs
+++ b/SabreTools.Library/DatFiles/DatFile.cs
@@ -983,7 +983,7 @@ namespace SabreTools.Library.DatFiles
                     OneRomPerGame();
 
                 // If we are removing fields, do that now
-                if (filter.RemoveFields)
+                if (Header.ExcludeFields != null && Header.ExcludeFields.Any())
                     RemoveFieldsFromItems();
 
                 // We remove any blanks, if we aren't supposed to have any
diff --git a/SabreTools.Library/Filtering/Filter.cs b/SabreTools.Library/Filtering/Filter.cs
index 6b0ef8a1..b6b1ba1c 100644
--- a/SabreTools.Library/Filtering/Filter.cs
+++ b/SabreTools.Library/Filtering/Filter.cs
@@ -283,12 +283,6 @@ namespace SabreTools.Library.Filtering
         /// </summary>
         public bool RemoveUnicode { get; set; }
 
-        /// <summary>
-        /// Remove fields based on Header values
-        /// </summary>
-        /// TODO: Remove in lieu of relying on Header value
-        public bool RemoveFields { get; set; }
-
         /// <summary>
         /// Include root directory when determing trim sizes
         /// </summary>