From 20ec4edeb8b234e570a2d44561b29ea38dc3838c Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 10 Jan 2025 21:52:21 -0500
Subject: [PATCH] Common DatItem properties can never be null

---
 SabreTools.DatFiles.Test/DatFileTests.Removal.cs | 3 ---
 SabreTools.DatFiles/DatFile.Removal.cs           | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/SabreTools.DatFiles.Test/DatFileTests.Removal.cs b/SabreTools.DatFiles.Test/DatFileTests.Removal.cs
index 5d794d55..431239d0 100644
--- a/SabreTools.DatFiles.Test/DatFileTests.Removal.cs
+++ b/SabreTools.DatFiles.Test/DatFileTests.Removal.cs
@@ -5,7 +5,6 @@ namespace SabreTools.DatFiles.Test
         #region RemoveHeaderFields
 
         // TODO: Write RemoveHeaderFields tests
-        // - Null header
         // - Empty list
         // - Full list
 
@@ -14,7 +13,6 @@ namespace SabreTools.DatFiles.Test
         #region RemoveItemFields
 
         // TODO: Write RemoveItemFields tests
-        // - Null item dict
         // - Both lists empty
         // - Machine only
         // - Item only
@@ -25,7 +23,6 @@ namespace SabreTools.DatFiles.Test
         #region RemoveItemFieldsDB
 
         // TODO: Write RemoveItemFieldsDB tests
-        // - Null item dict
         // - Both lists empty
         // - Machine only
         // - Item only
diff --git a/SabreTools.DatFiles/DatFile.Removal.cs b/SabreTools.DatFiles/DatFile.Removal.cs
index b8f9c60e..0fc287e5 100644
--- a/SabreTools.DatFiles/DatFile.Removal.cs
+++ b/SabreTools.DatFiles/DatFile.Removal.cs
@@ -18,7 +18,7 @@ namespace SabreTools.DatFiles
         public void RemoveHeaderFields(List<string> headerFieldNames)
         {
             // If we have an invalid input, return
-            if (Header == null || headerFieldNames.Count == 0)
+            if (headerFieldNames.Count == 0)
                 return;
 
             foreach (var fieldName in headerFieldNames)
@@ -34,7 +34,7 @@ namespace SabreTools.DatFiles
         public void RemoveItemFields(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
         {
             // If we have an invalid input, return
-            if (Items == null || (machineFieldNames.Count == 0 && itemFieldNames.Count == 0))
+            if (machineFieldNames.Count == 0 && itemFieldNames.Count == 0)
                 return;
 
 #if NET452_OR_GREATER || NETCOREAPP
@@ -70,7 +70,7 @@ namespace SabreTools.DatFiles
         public void RemoveItemFieldsDB(List<string> machineFieldNames, Dictionary<string, List<string>> itemFieldNames)
         {
             // If we have an invalid input, return
-            if (ItemsDB == null || (machineFieldNames.Count == 0 && itemFieldNames.Count == 0))
+            if (machineFieldNames.Count == 0 && itemFieldNames.Count == 0)
                 return;
 
             // Handle machine removals