diff --git a/SabreTools.Serialization/Models/WAD3/Constants.cs b/SabreTools.Serialization/Models/WAD3/Constants.cs
index 71639472..ae596b44 100644
--- a/SabreTools.Serialization/Models/WAD3/Constants.cs
+++ b/SabreTools.Serialization/Models/WAD3/Constants.cs
@@ -8,4 +8,4 @@ namespace SabreTools.Data.Models.WAD3
 
         public const uint SignatureUInt32 = 0x33444157;
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/WAD3/DirEntry.cs b/SabreTools.Serialization/Models/WAD3/DirEntry.cs
index 8299f02b..fe5b38fb 100644
--- a/SabreTools.Serialization/Models/WAD3/DirEntry.cs
+++ b/SabreTools.Serialization/Models/WAD3/DirEntry.cs
@@ -43,6 +43,6 @@ namespace SabreTools.Data.Models.WAD3
         /// </summary>
         /// <remarks>16 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 16)]
-        public string? Name;
+        public string Name;
     }
 }
diff --git a/SabreTools.Serialization/Models/WAD3/Enums.cs b/SabreTools.Serialization/Models/WAD3/Enums.cs
index cc2fe6bf..c99c6c91 100644
--- a/SabreTools.Serialization/Models/WAD3/Enums.cs
+++ b/SabreTools.Serialization/Models/WAD3/Enums.cs
@@ -25,4 +25,4 @@ namespace SabreTools.Data.Models.WAD3
         /// </summary>
         Font = 0x46,
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/WAD3/File.cs b/SabreTools.Serialization/Models/WAD3/File.cs
index 1920c4f9..fa5f9c01 100644
--- a/SabreTools.Serialization/Models/WAD3/File.cs
+++ b/SabreTools.Serialization/Models/WAD3/File.cs
@@ -9,16 +9,16 @@ namespace SabreTools.Data.Models.WAD3
         /// <summary>
         /// Deserialized header data
         /// </summary>
-        public Header? Header { get; set; }
+        public Header Header { get; set; }
 
         /// <summary>
         /// Deserialized dir entry data
         /// </summary>
-        public DirEntry[]? DirEntries { get; set; }
+        public DirEntry[] DirEntries { get; set; }
 
         /// <summary>
         /// Deserialized file entry data
         /// </summary>
-        public FileEntry[]? FileEntries { get; set; }
+        public FileEntry[] FileEntries { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/WAD3/FileEntry.cs b/SabreTools.Serialization/Models/WAD3/FileEntry.cs
index 5324da16..14d81045 100644
--- a/SabreTools.Serialization/Models/WAD3/FileEntry.cs
+++ b/SabreTools.Serialization/Models/WAD3/FileEntry.cs
@@ -8,4 +8,4 @@ namespace SabreTools.Data.Models.WAD3
     {
         // No shared fields between types
     }
-}
\ No newline at end of file
+}
diff --git a/SabreTools.Serialization/Models/WAD3/Font.cs b/SabreTools.Serialization/Models/WAD3/Font.cs
index 3bbe9642..99a062f1 100644
--- a/SabreTools.Serialization/Models/WAD3/Font.cs
+++ b/SabreTools.Serialization/Models/WAD3/Font.cs
@@ -35,6 +35,6 @@ namespace SabreTools.Data.Models.WAD3
         /// The color palette for the mipmaps (always 256 * 3 = 768 for GoldSrc)
         /// </summary>
         /// <remarks>[ColorsUsed][3]</remarks>
-        public byte[][]? Palette { get; set; }
+        public byte[][] Palette { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/WAD3/Header.cs b/SabreTools.Serialization/Models/WAD3/Header.cs
index a119c16e..7b4d229e 100644
--- a/SabreTools.Serialization/Models/WAD3/Header.cs
+++ b/SabreTools.Serialization/Models/WAD3/Header.cs
@@ -12,7 +12,7 @@ namespace SabreTools.Data.Models.WAD3
         /// </summary>
         /// <remarks>4 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 4)]
-        public string? Signature;
+        public string Signature;
 
         /// <summary>
         /// Number of Directory entries
diff --git a/SabreTools.Serialization/Models/WAD3/MipMap.cs b/SabreTools.Serialization/Models/WAD3/MipMap.cs
index a02bff2b..b1e52fe7 100644
--- a/SabreTools.Serialization/Models/WAD3/MipMap.cs
+++ b/SabreTools.Serialization/Models/WAD3/MipMap.cs
@@ -7,6 +7,6 @@ namespace SabreTools.Data.Models.WAD3
         /// Raw image data. Each byte points to an index in the palette
         /// </summary>
         /// <remarks>[width][height]</remarks>
-        public byte[][]? Data { get; set; }
+        public byte[][] Data { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Models/WAD3/MipTex.cs b/SabreTools.Serialization/Models/WAD3/MipTex.cs
index e6718e45..cd5e6936 100644
--- a/SabreTools.Serialization/Models/WAD3/MipTex.cs
+++ b/SabreTools.Serialization/Models/WAD3/MipTex.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Data.Models.WAD3
         /// </summary>
         /// <remarks>16 bytes</remarks>
         [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 16)]
-        public string? Name;
+        public string Name;
 
         /// <summary>
         /// Dimensions of the texture (must be divisible by 16)
diff --git a/SabreTools.Serialization/Models/WAD3/QpicImage.cs b/SabreTools.Serialization/Models/WAD3/QpicImage.cs
index efaad4e9..246a96ef 100644
--- a/SabreTools.Serialization/Models/WAD3/QpicImage.cs
+++ b/SabreTools.Serialization/Models/WAD3/QpicImage.cs
@@ -17,7 +17,7 @@ namespace SabreTools.Data.Models.WAD3
         /// Raw image data. Each byte points to an index in the palette
         /// </summary>
         /// <remarks>[height][width]</remarks>
-        public byte[][]? Data { get; set; }
+        public byte[][] Data { get; set; }
 
         /// <summary>
         /// Number of colors used in the palette (always 256 for GoldSrc)
@@ -28,6 +28,6 @@ namespace SabreTools.Data.Models.WAD3
         /// The color palette for the mipmaps (always 256 * 3 = 768 for GoldSrc)
         /// </summary>
         /// <remarks>[ColorsUsed][3]</remarks>
-        public byte[][]? Palette { get; set; }
+        public byte[][] Palette { get; set; }
     }
 }
diff --git a/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs b/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs
index c8a6f1c1..ff776133 100644
--- a/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs
+++ b/SabreTools.Serialization/Wrappers/WAD3.Extraction.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Serialization.Wrappers
         public bool Extract(string outputDirectory, bool includeDebug)
         {
             // If we have no lumps
-            if (DirEntries == null || DirEntries.Length == 0)
+            if (DirEntries.Length == 0)
                 return false;
 
             // Loop through and extract all lumps to the output
@@ -32,7 +32,7 @@ namespace SabreTools.Serialization.Wrappers
         public bool ExtractLump(int index, string outputDirectory, bool includeDebug)
         {
             // If we have no lumps
-            if (DirEntries == null || DirEntries.Length == 0)
+            if (DirEntries.Length == 0)
                 return false;
 
             // If the lumps index is invalid
diff --git a/SabreTools.Serialization/Wrappers/WAD3.Printing.cs b/SabreTools.Serialization/Wrappers/WAD3.Printing.cs
index b7f99fe4..5fc9fffe 100644
--- a/SabreTools.Serialization/Wrappers/WAD3.Printing.cs
+++ b/SabreTools.Serialization/Wrappers/WAD3.Printing.cs
@@ -23,28 +23,21 @@ namespace SabreTools.Serialization.Wrappers
             Print(builder, Model.FileEntries);
         }
 
-        private static void Print(StringBuilder builder, Header? header)
+        private static void Print(StringBuilder builder, Header header)
         {
             builder.AppendLine("  Header Information:");
             builder.AppendLine("  -------------------------");
-            if (header == null)
-            {
-                builder.AppendLine("  No header");
-                builder.AppendLine();
-                return;
-            }
-
             builder.AppendLine(header.Signature, "  Signature");
             builder.AppendLine(header.NumDirs, "  Number of directory entries");
             builder.AppendLine(header.DirOffset, "  Offset to first directory entry");
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, DirEntry[]? entries)
+        private static void Print(StringBuilder builder, DirEntry[] entries)
         {
             builder.AppendLine("  Directory Entries Information:");
             builder.AppendLine("  -------------------------");
-            if (entries == null || entries.Length == 0)
+            if (entries.Length == 0)
             {
                 builder.AppendLine("  No directory entries");
                 builder.AppendLine();
@@ -68,11 +61,11 @@ namespace SabreTools.Serialization.Wrappers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, FileEntry[]? entries)
+        private static void Print(StringBuilder builder, FileEntry[] entries)
         {
             builder.AppendLine("  File Entries Information:");
             builder.AppendLine("  -------------------------");
-            if (entries == null || entries.Length == 0)
+            if (entries.Length == 0)
             {
                 builder.AppendLine("  No file entries");
                 builder.AppendLine();
diff --git a/SabreTools.Serialization/Wrappers/WAD3.cs b/SabreTools.Serialization/Wrappers/WAD3.cs
index 9f25cd48..2a74856d 100644
--- a/SabreTools.Serialization/Wrappers/WAD3.cs
+++ b/SabreTools.Serialization/Wrappers/WAD3.cs
@@ -14,7 +14,7 @@ namespace SabreTools.Serialization.Wrappers
         #region Extension Properties
 
         /// <inheritdoc cref="Models.WAD3.File.DirEntries"/>
-        public Data.Models.WAD3.DirEntry[]? DirEntries => Model.DirEntries;
+        public Data.Models.WAD3.DirEntry[] DirEntries => Model.DirEntries;
 
         #endregion