diff --git a/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Deserializer.cs b/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Deserializer.cs
index 2d35df11..ae39567f 100644
--- a/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Deserializer.cs
+++ b/SabreTools.Serialization/CrossModel/ArchiveDotOrg.Deserializer.cs
@@ -18,7 +18,6 @@ namespace SabreTools.Serialization.CrossModel
             if (machines != null && machines.Length > 0)
             {
                 files.File = machines
-                    .Where(m => m != null)
                     .SelectMany(ConvertFromInternalModel)
                     .ToArray();
             }
diff --git a/SabreTools.Serialization/CrossModel/AttractMode.Deserializer.cs b/SabreTools.Serialization/CrossModel/AttractMode.Deserializer.cs
index 67b3b522..4dffbe18 100644
--- a/SabreTools.Serialization/CrossModel/AttractMode.Deserializer.cs
+++ b/SabreTools.Serialization/CrossModel/AttractMode.Deserializer.cs
@@ -20,7 +20,6 @@ namespace SabreTools.Serialization.CrossModel
             if (machines != null && machines.Length > 0)
             {
                 metadataFile.Row = machines
-                    .Where(m => m != null)
                     .SelectMany(ConvertMachineFromInternalModel)
                     .ToArray();
             }
diff --git a/SabreTools.Serialization/CrossModel/EverdriveSMDB.Deserializer.cs b/SabreTools.Serialization/CrossModel/EverdriveSMDB.Deserializer.cs
index 44cb8baa..fd971717 100644
--- a/SabreTools.Serialization/CrossModel/EverdriveSMDB.Deserializer.cs
+++ b/SabreTools.Serialization/CrossModel/EverdriveSMDB.Deserializer.cs
@@ -19,7 +19,6 @@ namespace SabreTools.Serialization.CrossModel
             if (machines != null && machines.Length > 0)
             {
                 metadataFile.Row = machines
-                    .Where(m => m != null)
                     .SelectMany(ConvertMachineFromInternalModel)
                     .ToArray();
             }
diff --git a/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs b/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs
index 527458eb..35d8d6b7 100644
--- a/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs
+++ b/SabreTools.Serialization/CrossModel/Logiqx.Serializer.cs
@@ -26,7 +26,6 @@ namespace SabreTools.Serialization.CrossModel
             if (item.Dir != null && item.Dir.Length > 0)
             {
                 machines.AddRange(item.Dir
-                    .Where(d => d != null)
                     .SelectMany(ConvertDirToInternalModel));
             }
 
diff --git a/SabreTools.Serialization/CrossModel/RomCenter.Deserializer.cs b/SabreTools.Serialization/CrossModel/RomCenter.Deserializer.cs
index b4f7d2a6..a05349cf 100644
--- a/SabreTools.Serialization/CrossModel/RomCenter.Deserializer.cs
+++ b/SabreTools.Serialization/CrossModel/RomCenter.Deserializer.cs
@@ -22,7 +22,6 @@ namespace SabreTools.Serialization.CrossModel
                 metadataFile.Games = new Games
                 {
                     Rom = machines
-                        .Where(m => m != null)
                         .SelectMany(ConvertMachineFromInternalModel)
                         .ToArray()
                 };
diff --git a/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs b/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs
index 52bb03d1..af973c3a 100644
--- a/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs
+++ b/SabreTools.Serialization/CrossModel/SeparatedValue.Deserializer.cs
@@ -21,7 +21,6 @@ namespace SabreTools.Serialization.CrossModel
             if (machines != null && machines.Length > 0)
             {
                 metadataFile.Row = machines
-                    .Where(m => m != null)
                     .SelectMany(m => ConvertMachineFromInternalModel(m, header))
                     .ToArray();
             }
diff --git a/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs b/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs
index 31a62c22..a3da6362 100644
--- a/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs
+++ b/SabreTools.Serialization/Serializers/BaseBinarySerializer.cs
@@ -123,11 +123,11 @@ namespace SabreTools.Serialization.Serializers
                 List<Type> assemblyTypes = [];
                 try
                 {
-                    assemblyTypes = assembly.GetTypes().ToList<Type>();
+                    assemblyTypes = [.. assembly.GetTypes()];
                 }
                 catch (ReflectionTypeLoadException rtle)
                 {
-                    assemblyTypes = rtle.Types.Where(t => t != null)!.ToList<Type>();
+                    assemblyTypes = [.. rtle.Types];
                 }
 
                 // Loop through all types