diff --git a/RombaSharp/Features/Archive.cs b/RombaSharp/Features/Archive.cs
index 4efdc052..b06db0ad 100644
--- a/RombaSharp/Features/Archive.cs
+++ b/RombaSharp/Features/Archive.cs
@@ -206,7 +206,7 @@ have a current entry in the DAT index.";
                 outDir: _depots!.Keys.ToList()[0],
                 outputFormat: OutputFormat.TorrentGzipRomba,
                 asFiles: TreatAsFile.NonArchive);
-            
+
             return true;
         }
     }
diff --git a/RombaSharp/Features/DatStats.cs b/RombaSharp/Features/DatStats.cs
index 9493e51b..e2118913 100644
--- a/RombaSharp/Features/DatStats.cs
+++ b/RombaSharp/Features/DatStats.cs
@@ -42,7 +42,7 @@ namespace RombaSharp.Features
                 baddumpCol: true,
                 nodumpCol: true,
                 StatReportFormat.Textfile);
-            
+
             return true;
         }
     }
diff --git a/SabreTools.Core/Filter/Operation.cs b/SabreTools.Core/Filter/Operation.cs
index 34ef3e7e..2de1cd82 100644
--- a/SabreTools.Core/Filter/Operation.cs
+++ b/SabreTools.Core/Filter/Operation.cs
@@ -9,7 +9,7 @@ namespace SabreTools.Core.Filter
         /// Default value, does nothing
         /// </summary>
         NONE,
-        
+
         Equals,
         NotEquals,
         GreaterThan,
diff --git a/SabreTools.DatFiles/DatFile.ToMetadata.cs b/SabreTools.DatFiles/DatFile.ToMetadata.cs
index 1402ddf7..a45cba09 100644
--- a/SabreTools.DatFiles/DatFile.ToMetadata.cs
+++ b/SabreTools.DatFiles/DatFile.ToMetadata.cs
@@ -1429,6 +1429,6 @@ namespace SabreTools.DatFiles
             }
         }
 
-#endregion
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SabreTools.DatFiles/DatStatistics.cs b/SabreTools.DatFiles/DatStatistics.cs
index 5c7a0c88..9ad20e40 100644
--- a/SabreTools.DatFiles/DatStatistics.cs
+++ b/SabreTools.DatFiles/DatStatistics.cs
@@ -57,7 +57,7 @@ namespace SabreTools.DatFiles
         /// Number of items with the remove flag
         /// </summary>
         public long RemovedCount { get; private set; } = 0;
-        
+
         /// <summary>
         /// Name to display on output
         /// </summary>
diff --git a/SabreTools.DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/ItemDictionary.cs
index 16604cbb..832086e2 100644
--- a/SabreTools.DatFiles/ItemDictionary.cs
+++ b/SabreTools.DatFiles/ItemDictionary.cs
@@ -7,7 +7,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
 #endif
diff --git a/SabreTools.DatFiles/Setter.cs b/SabreTools.DatFiles/Setter.cs
index 588a03a2..ab33944a 100644
--- a/SabreTools.DatFiles/Setter.cs
+++ b/SabreTools.DatFiles/Setter.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using SabreTools.Core;
 using SabreTools.Core.Filter;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
diff --git a/SabreTools.DatItems/Formats/Adjuster.cs b/SabreTools.DatItems/Formats/Adjuster.cs
index e18281e0..80d062e8 100644
--- a/SabreTools.DatItems/Formats/Adjuster.cs
+++ b/SabreTools.DatItems/Formats/Adjuster.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Analog.cs b/SabreTools.DatItems/Formats/Analog.cs
index d8ce98d7..ec4223bd 100644
--- a/SabreTools.DatItems/Formats/Analog.cs
+++ b/SabreTools.DatItems/Formats/Analog.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Archive.cs b/SabreTools.DatItems/Formats/Archive.cs
index 862518e1..17dd6e59 100644
--- a/SabreTools.DatItems/Formats/Archive.cs
+++ b/SabreTools.DatItems/Formats/Archive.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/BiosSet.cs b/SabreTools.DatItems/Formats/BiosSet.cs
index 22eaa0d1..c998aa17 100644
--- a/SabreTools.DatItems/Formats/BiosSet.cs
+++ b/SabreTools.DatItems/Formats/BiosSet.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Blank.cs b/SabreTools.DatItems/Formats/Blank.cs
index 7ac35a10..4f11f2db 100644
--- a/SabreTools.DatItems/Formats/Blank.cs
+++ b/SabreTools.DatItems/Formats/Blank.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 namespace SabreTools.DatItems.Formats
diff --git a/SabreTools.DatItems/Formats/Chip.cs b/SabreTools.DatItems/Formats/Chip.cs
index f1d78491..3477bcb4 100644
--- a/SabreTools.DatItems/Formats/Chip.cs
+++ b/SabreTools.DatItems/Formats/Chip.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Condition.cs b/SabreTools.DatItems/Formats/Condition.cs
index 1a92ee5f..12f4c059 100644
--- a/SabreTools.DatItems/Formats/Condition.cs
+++ b/SabreTools.DatItems/Formats/Condition.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/ConfLocation.cs b/SabreTools.DatItems/Formats/ConfLocation.cs
index 63bca63b..554d1886 100644
--- a/SabreTools.DatItems/Formats/ConfLocation.cs
+++ b/SabreTools.DatItems/Formats/ConfLocation.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/ConfSetting.cs b/SabreTools.DatItems/Formats/ConfSetting.cs
index 59cb2ec7..43916aa6 100644
--- a/SabreTools.DatItems/Formats/ConfSetting.cs
+++ b/SabreTools.DatItems/Formats/ConfSetting.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Configuration.cs b/SabreTools.DatItems/Formats/Configuration.cs
index da5fc17c..cd500fb5 100644
--- a/SabreTools.DatItems/Formats/Configuration.cs
+++ b/SabreTools.DatItems/Formats/Configuration.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Control.cs b/SabreTools.DatItems/Formats/Control.cs
index ccee242a..31b44385 100644
--- a/SabreTools.DatItems/Formats/Control.cs
+++ b/SabreTools.DatItems/Formats/Control.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/DataArea.cs b/SabreTools.DatItems/Formats/DataArea.cs
index 125b7ea2..efb32942 100644
--- a/SabreTools.DatItems/Formats/DataArea.cs
+++ b/SabreTools.DatItems/Formats/DataArea.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Device.cs b/SabreTools.DatItems/Formats/Device.cs
index 0f4d891b..ce709c4a 100644
--- a/SabreTools.DatItems/Formats/Device.cs
+++ b/SabreTools.DatItems/Formats/Device.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/DeviceRef.cs b/SabreTools.DatItems/Formats/DeviceRef.cs
index cb31e83f..4b400903 100644
--- a/SabreTools.DatItems/Formats/DeviceRef.cs
+++ b/SabreTools.DatItems/Formats/DeviceRef.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/DipLocation.cs b/SabreTools.DatItems/Formats/DipLocation.cs
index 7329c1b3..8bc69e5c 100644
--- a/SabreTools.DatItems/Formats/DipLocation.cs
+++ b/SabreTools.DatItems/Formats/DipLocation.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/DipSwitch.cs b/SabreTools.DatItems/Formats/DipSwitch.cs
index 965fc8ef..25343e59 100644
--- a/SabreTools.DatItems/Formats/DipSwitch.cs
+++ b/SabreTools.DatItems/Formats/DipSwitch.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/DipValue.cs b/SabreTools.DatItems/Formats/DipValue.cs
index 076d4ce8..06c7420b 100644
--- a/SabreTools.DatItems/Formats/DipValue.cs
+++ b/SabreTools.DatItems/Formats/DipValue.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/DiskArea.cs b/SabreTools.DatItems/Formats/DiskArea.cs
index f46a40f2..930c12e0 100644
--- a/SabreTools.DatItems/Formats/DiskArea.cs
+++ b/SabreTools.DatItems/Formats/DiskArea.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Display.cs b/SabreTools.DatItems/Formats/Display.cs
index dfac767e..eb31b4ff 100644
--- a/SabreTools.DatItems/Formats/Display.cs
+++ b/SabreTools.DatItems/Formats/Display.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 namespace SabreTools.DatItems.Formats
diff --git a/SabreTools.DatItems/Formats/Driver.cs b/SabreTools.DatItems/Formats/Driver.cs
index 4506fb06..605e7a0b 100644
--- a/SabreTools.DatItems/Formats/Driver.cs
+++ b/SabreTools.DatItems/Formats/Driver.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Extension.cs b/SabreTools.DatItems/Formats/Extension.cs
index 2e69f6a5..4ef41743 100644
--- a/SabreTools.DatItems/Formats/Extension.cs
+++ b/SabreTools.DatItems/Formats/Extension.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Feature.cs b/SabreTools.DatItems/Formats/Feature.cs
index 7e68438b..ed3f8301 100644
--- a/SabreTools.DatItems/Formats/Feature.cs
+++ b/SabreTools.DatItems/Formats/Feature.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/File.cs b/SabreTools.DatItems/Formats/File.cs
index 1b489c1b..1e3baa8a 100644
--- a/SabreTools.DatItems/Formats/File.cs
+++ b/SabreTools.DatItems/Formats/File.cs
@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
 using SabreTools.Hashing;
diff --git a/SabreTools.DatItems/Formats/Info.cs b/SabreTools.DatItems/Formats/Info.cs
index f5398e5f..e51c0937 100644
--- a/SabreTools.DatItems/Formats/Info.cs
+++ b/SabreTools.DatItems/Formats/Info.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Input.cs b/SabreTools.DatItems/Formats/Input.cs
index 0650a96c..7bb78cc0 100644
--- a/SabreTools.DatItems/Formats/Input.cs
+++ b/SabreTools.DatItems/Formats/Input.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Instance.cs b/SabreTools.DatItems/Formats/Instance.cs
index 1e929ca6..cbd2ae1d 100644
--- a/SabreTools.DatItems/Formats/Instance.cs
+++ b/SabreTools.DatItems/Formats/Instance.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Part.cs b/SabreTools.DatItems/Formats/Part.cs
index 35446488..91d8bec4 100644
--- a/SabreTools.DatItems/Formats/Part.cs
+++ b/SabreTools.DatItems/Formats/Part.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/PartFeature.cs b/SabreTools.DatItems/Formats/PartFeature.cs
index 450bfc6d..2c824c09 100644
--- a/SabreTools.DatItems/Formats/PartFeature.cs
+++ b/SabreTools.DatItems/Formats/PartFeature.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Port.cs b/SabreTools.DatItems/Formats/Port.cs
index 7081f221..019083df 100644
--- a/SabreTools.DatItems/Formats/Port.cs
+++ b/SabreTools.DatItems/Formats/Port.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/RamOption.cs b/SabreTools.DatItems/Formats/RamOption.cs
index a9889326..28d8fc00 100644
--- a/SabreTools.DatItems/Formats/RamOption.cs
+++ b/SabreTools.DatItems/Formats/RamOption.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Release.cs b/SabreTools.DatItems/Formats/Release.cs
index b19d9eab..e78cf800 100644
--- a/SabreTools.DatItems/Formats/Release.cs
+++ b/SabreTools.DatItems/Formats/Release.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/ReleaseDetails.cs b/SabreTools.DatItems/Formats/ReleaseDetails.cs
index b5017e01..7b19d40d 100644
--- a/SabreTools.DatItems/Formats/ReleaseDetails.cs
+++ b/SabreTools.DatItems/Formats/ReleaseDetails.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 // TODO: Add item mappings for all fields
diff --git a/SabreTools.DatItems/Formats/Sample.cs b/SabreTools.DatItems/Formats/Sample.cs
index b25666ac..b70891fc 100644
--- a/SabreTools.DatItems/Formats/Sample.cs
+++ b/SabreTools.DatItems/Formats/Sample.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Serials.cs b/SabreTools.DatItems/Formats/Serials.cs
index 1183ef89..65ec412b 100644
--- a/SabreTools.DatItems/Formats/Serials.cs
+++ b/SabreTools.DatItems/Formats/Serials.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 // TODO: Add item mappings for all fields
diff --git a/SabreTools.DatItems/Formats/SharedFeat.cs b/SabreTools.DatItems/Formats/SharedFeat.cs
index 94360dc4..0fa32a42 100644
--- a/SabreTools.DatItems/Formats/SharedFeat.cs
+++ b/SabreTools.DatItems/Formats/SharedFeat.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Slot.cs b/SabreTools.DatItems/Formats/Slot.cs
index 7819aa9d..6c8b1ead 100644
--- a/SabreTools.DatItems/Formats/Slot.cs
+++ b/SabreTools.DatItems/Formats/Slot.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/SlotOption.cs b/SabreTools.DatItems/Formats/SlotOption.cs
index 316910c5..4164040e 100644
--- a/SabreTools.DatItems/Formats/SlotOption.cs
+++ b/SabreTools.DatItems/Formats/SlotOption.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/SoftwareList.cs b/SabreTools.DatItems/Formats/SoftwareList.cs
index 7cf4cfbf..d92a097a 100644
--- a/SabreTools.DatItems/Formats/SoftwareList.cs
+++ b/SabreTools.DatItems/Formats/SoftwareList.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/Sound.cs b/SabreTools.DatItems/Formats/Sound.cs
index 589bc1dd..c96f542d 100644
--- a/SabreTools.DatItems/Formats/Sound.cs
+++ b/SabreTools.DatItems/Formats/Sound.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 
 namespace SabreTools.DatItems.Formats
 {
diff --git a/SabreTools.DatItems/Formats/SourceDetails.cs b/SabreTools.DatItems/Formats/SourceDetails.cs
index cf728827..3af65a9e 100644
--- a/SabreTools.DatItems/Formats/SourceDetails.cs
+++ b/SabreTools.DatItems/Formats/SourceDetails.cs
@@ -1,6 +1,5 @@
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 
 // TODO: Add item mappings for all fields
diff --git a/SabreTools.DatTools/DatFileTool.cs b/SabreTools.DatTools/DatFileTool.cs
index c9f7cc04..236274e7 100644
--- a/SabreTools.DatTools/DatFileTool.cs
+++ b/SabreTools.DatTools/DatFileTool.cs
@@ -3,8 +3,6 @@ using System.IO;
 using System.Linq;
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
-using Microsoft.VisualBasic;
-
 #endif
 using SabreTools.Core;
 using SabreTools.DatFiles;
diff --git a/SabreTools.DatTools/Splitter.cs b/SabreTools.DatTools/Splitter.cs
index 053ae178..2deb5d32 100644
--- a/SabreTools.DatTools/Splitter.cs
+++ b/SabreTools.DatTools/Splitter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/SabreTools.DatTools/Statistics.cs b/SabreTools.DatTools/Statistics.cs
index b3bba3cc..a468e686 100644
--- a/SabreTools.DatTools/Statistics.cs
+++ b/SabreTools.DatTools/Statistics.cs
@@ -6,7 +6,6 @@ using System.Net;
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
 #endif
-using SabreTools.Core;
 using SabreTools.DatFiles;
 using SabreTools.IO;
 using SabreTools.IO.Extensions;
diff --git a/SabreTools.DatTools/Writer.cs b/SabreTools.DatTools/Writer.cs
index 7d2ef2b1..937a24a8 100644
--- a/SabreTools.DatTools/Writer.cs
+++ b/SabreTools.DatTools/Writer.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 #if NET40_OR_GREATER || NETCOREAPP
 using System.Threading.Tasks;
 #endif
-using SabreTools.Core;
 using SabreTools.DatFiles;
 using SabreTools.DatItems;
 using SabreTools.IO.Extensions;
@@ -167,14 +166,14 @@ namespace SabreTools.DatTools
             {
                 if (string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)) && string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)))
                 {
-                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey,"Default");
+                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey, "Default");
                     datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, "Default");
                     datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.DescriptionKey, "Default");
                 }
 
                 else if (string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.NameKey)) && !string.IsNullOrEmpty(datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey)))
                 {
-                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey,datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey));
+                    datFile.Header.SetFieldValue<string?>(DatHeader.FileNameKey, datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey));
                     datFile.Header.SetFieldValue<string?>(Models.Metadata.Header.NameKey, datFile.Header.GetStringFieldValue(Models.Metadata.Header.DescriptionKey));
                 }
 
diff --git a/SabreTools.FileTypes/BaseArchive.cs b/SabreTools.FileTypes/BaseArchive.cs
index d0a05b24..70f210ee 100644
--- a/SabreTools.FileTypes/BaseArchive.cs
+++ b/SabreTools.FileTypes/BaseArchive.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-
 using SabreTools.FileTypes.Archives;
 
 namespace SabreTools.FileTypes
diff --git a/SabreTools.Filtering/Replacer.cs b/SabreTools.Filtering/Replacer.cs
index d35605a1..86349672 100644
--- a/SabreTools.Filtering/Replacer.cs
+++ b/SabreTools.Filtering/Replacer.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.Linq;
-using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
diff --git a/SabreTools.Help/TopLevel.cs b/SabreTools.Help/TopLevel.cs
index 737508c8..32ff39f0 100644
--- a/SabreTools.Help/TopLevel.cs
+++ b/SabreTools.Help/TopLevel.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-
 using SabreTools.Logging;
 
 namespace SabreTools.Help
diff --git a/SabreTools.Logging/LogEventArgs.cs b/SabreTools.Logging/LogEventArgs.cs
index 3de36c1b..3200bb70 100644
--- a/SabreTools.Logging/LogEventArgs.cs
+++ b/SabreTools.Logging/LogEventArgs.cs
@@ -1,7 +1,5 @@
 using System;
 
-using SabreTools.Core;
-
 namespace SabreTools.Logging
 {
     /// <summary>
diff --git a/SabreTools.Logging/Logger.cs b/SabreTools.Logging/Logger.cs
index 61641bb2..8af8cf54 100644
--- a/SabreTools.Logging/Logger.cs
+++ b/SabreTools.Logging/Logger.cs
@@ -12,7 +12,7 @@ namespace SabreTools.Logging
         /// </summary>
         /// TODO: Derive class name for this object, if possible
         private readonly object? instance;
-        
+
         /// <summary>
         /// Constructor
         /// </summary>
diff --git a/SabreTools.Reports/BaseReport.cs b/SabreTools.Reports/BaseReport.cs
index a56f0555..7637e67b 100644
--- a/SabreTools.Reports/BaseReport.cs
+++ b/SabreTools.Reports/BaseReport.cs
@@ -59,7 +59,7 @@ namespace SabreTools.Reports
         /// <param name="throwOnError">True if the error that is thrown should be thrown back to the caller, false otherwise</param>
         /// <returns>True if the report was written correctly, false otherwise</returns>
         public abstract bool WriteToFile(string? outfile, bool baddumpCol, bool nodumpCol, bool throwOnError = false);
-    
+
         /// <summary>
         /// Returns the human-readable file size for an arbitrary, 64-bit file size 
         /// The default format is "0.### XB", e.g. "4.2 KB" or "1.434 GB"
diff --git a/SabreTools.Reports/Formats/Textfile.cs b/SabreTools.Reports/Formats/Textfile.cs
index ffb53c9a..16ff42c6 100644
--- a/SabreTools.Reports/Formats/Textfile.cs
+++ b/SabreTools.Reports/Formats/Textfile.cs
@@ -53,7 +53,7 @@ namespace SabreTools.Reports.Formats
                     if (stat.IsDirectory)
                     {
                         WriteIndividual(sw, stat, baddumpCol, nodumpCol);
-                        
+
                         // If we have anything but the last value, write the separator
                         if (i < Statistics.Count - 1)
                             WriteFooterSeparator(sw);
diff --git a/SabreTools/Enums.cs b/SabreTools/Enums.cs
index e6b21012..493918ac 100644
--- a/SabreTools/Enums.cs
+++ b/SabreTools/Enums.cs
@@ -2,48 +2,48 @@ using System;
 
 namespace SabreTools
 {
-        /// <summary>
-        /// Determines how the DAT will be split on output
-        /// </summary>
-        [Flags]
-        public enum SplittingMode
-        {
-            None = 0x00,
+    /// <summary>
+    /// Determines how the DAT will be split on output
+    /// </summary>
+    [Flags]
+    public enum SplittingMode
+    {
+        None = 0x00,
 
-            Extension = 1 << 0,
-            Hash = 1 << 1,
-            Level = 1 << 2,
-            Type = 1 << 3,
-            Size = 1 << 4,
-            TotalSize = 1 << 5,
-        }
+        Extension = 1 << 0,
+        Hash = 1 << 1,
+        Level = 1 << 2,
+        Type = 1 << 3,
+        Size = 1 << 4,
+        TotalSize = 1 << 5,
+    }
 
-        /// <summary>
-        /// Determines special update modes
-        /// </summary>
-        [Flags]
-        public enum UpdateMode
-        {
-            None = 0x00,
+    /// <summary>
+    /// Determines special update modes
+    /// </summary>
+    [Flags]
+    public enum UpdateMode
+    {
+        None = 0x00,
 
-            // Standard diffs
-            DiffDupesOnly = 1 << 0,
-            DiffNoDupesOnly = 1 << 1,
-            DiffIndividualsOnly = 1 << 2,
+        // Standard diffs
+        DiffDupesOnly = 1 << 0,
+        DiffNoDupesOnly = 1 << 1,
+        DiffIndividualsOnly = 1 << 2,
 
-            // Cascaded diffs
-            DiffCascade = 1 << 3,
-            DiffReverseCascade = 1 << 4,
+        // Cascaded diffs
+        DiffCascade = 1 << 3,
+        DiffReverseCascade = 1 << 4,
 
-            // Base diffs
-            DiffAgainst = 1 << 5,
+        // Base diffs
+        DiffAgainst = 1 << 5,
 
-            // Special update modes
-            Merge = 1 << 6,
-            BaseReplace = 1 << 7,
-            ReverseBaseReplace = 1 << 8,
+        // Special update modes
+        Merge = 1 << 6,
+        BaseReplace = 1 << 7,
+        ReverseBaseReplace = 1 << 8,
 
-            // Combinations
-            AllDiffs = DiffDupesOnly | DiffNoDupesOnly | DiffIndividualsOnly,
-        }
+        // Combinations
+        AllDiffs = DiffDupesOnly | DiffNoDupesOnly | DiffIndividualsOnly,
+    }
 }
diff --git a/SabreTools/Features/BaseFeature.cs b/SabreTools/Features/BaseFeature.cs
index 31b9cf5b..aa7b0f51 100644
--- a/SabreTools/Features/BaseFeature.cs
+++ b/SabreTools/Features/BaseFeature.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using Microsoft.Data.Sqlite;
 using SabreTools.Core;
diff --git a/SabreTools/Features/Batch.cs b/SabreTools/Features/Batch.cs
index 25d4c967..fb13e50c 100644
--- a/SabreTools/Features/Batch.cs
+++ b/SabreTools/Features/Batch.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
-using SabreTools.Core;
 using SabreTools.Core.Filter;
 using SabreTools.Core.Tools;
 using SabreTools.DatFiles;
diff --git a/SabreTools/Features/Stats.cs b/SabreTools/Features/Stats.cs
index 595560b8..6582691d 100644
--- a/SabreTools/Features/Stats.cs
+++ b/SabreTools/Features/Stats.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-
 using SabreTools.DatTools;
 using SabreTools.Help;
 
diff --git a/SabreTools/Features/Update.cs b/SabreTools/Features/Update.cs
index 94d1a989..62702ebc 100644
--- a/SabreTools/Features/Update.cs
+++ b/SabreTools/Features/Update.cs
@@ -424,7 +424,7 @@ namespace SabreTools.Features
                 // If we're in SuperDAT mode, prefix all games with their respective DATs
                 if (string.Equals(userInputDat.Header.GetStringFieldValue(Models.Metadata.Header.TypeKey), "SuperDAT", StringComparison.OrdinalIgnoreCase))
                     DatFileTool.ApplySuperDAT(userInputDat, inputPaths);
-                    //DatFileTool.ApplySuperDATDB(userInputDat, inputPaths);
+                //DatFileTool.ApplySuperDATDB(userInputDat, inputPaths);
 
                 Writer.Write(userInputDat, OutputDir);
             }