diff --git a/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs b/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs
index bde2716b..e89310fe 100644
--- a/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs
+++ b/SabreTools.DatFiles.Test/DatFileTests.Filtering.cs
@@ -8,6 +8,12 @@ namespace SabreTools.DatFiles.Test
 {
     public partial class DatFileTests
     {
+        #region ExecuteFilters
+
+        // TODO: Add ExecuteFilters tests
+
+        #endregion
+
         #region MachineDescriptionToName
 
         [Fact]
diff --git a/SabreTools.DatFiles/DatFile.Filtering.cs b/SabreTools.DatFiles/DatFile.Filtering.cs
index 44f2908f..33f33e44 100644
--- a/SabreTools.DatFiles/DatFile.Filtering.cs
+++ b/SabreTools.DatFiles/DatFile.Filtering.cs
@@ -34,8 +34,8 @@ namespace SabreTools.DatFiles
         /// <param name="filterRunner">Preconfigured filter runner to use</param>
         public void ExecuteFilters(FilterRunner filterRunner)
         {
-            Items.ExecuteFilters(filterRunner);
-            ItemsDB.ExecuteFilters(filterRunner);
+            ExecuteFiltersImpl(filterRunner);
+            ExecuteFiltersImplDB(filterRunner);
         }
 
         /// <summary>
@@ -184,6 +184,99 @@ namespace SabreTools.DatFiles
             return mapping;
         }
 
+        /// <summary>
+        /// Execute all filters in a filter runner on the items in the dictionary
+        /// </summary>
+        /// <param name="filterRunner">Preconfigured filter runner to use</param>
+        private void ExecuteFiltersImpl(FilterRunner filterRunner)
+        {
+            List<string> keys = [.. Items.Keys];
+#if NET452_OR_GREATER || NETCOREAPP
+            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
+#elif NET40_OR_GREATER
+            Parallel.ForEach(keys, key =>
+#else
+            foreach (var key in keys)
+#endif
+            {
+                ExecuteFilterOnBucket(filterRunner, key);
+#if NET40_OR_GREATER || NETCOREAPP
+            });
+#else
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Execute all filters in a filter runner on the items in the dictionary
+        /// </summary>
+        /// <param name="filterRunner">Preconfigured filter runner to use</param>
+        private void ExecuteFiltersImplDB(FilterRunner filterRunner)
+        {
+            List<string> keys = [.. ItemsDB.SortedKeys];
+#if NET452_OR_GREATER || NETCOREAPP
+            Parallel.ForEach(keys, Globals.ParallelOptions, key =>
+#elif NET40_OR_GREATER
+            Parallel.ForEach(keys, key =>
+#else
+            foreach (var key in keys)
+#endif
+            {
+                ExecuteFilterOnBucketDB(filterRunner, key);
+#if NET40_OR_GREATER || NETCOREAPP
+            });
+#else
+            }
+#endif
+        }
+
+        /// <summary>
+        /// Execute all filters in a filter runner on a single bucket
+        /// </summary>
+        /// <param name="filterRunner">Preconfigured filter runner to use</param>
+        /// <param name="bucketName">Name of the bucket to filter on</param>
+        private void ExecuteFilterOnBucket(FilterRunner filterRunner, string bucketName)
+        {
+            List<DatItem>? items = GetItemsForBucket(bucketName);
+            if (items == null)
+                return;
+
+            // Filter all items in the current key
+            List<DatItem> newItems = [];
+            foreach (var item in items)
+            {
+                if (item.PassesFilter(filterRunner))
+                    newItems.Add(item);
+            }
+
+            // Set the value in the key to the new set
+            Remove(bucketName);
+            Add(bucketName, newItems);
+        }
+
+        /// <summary>
+        /// Execute all filters in a filter runner on a single bucket
+        /// </summary>
+        /// <param name="filterRunner">Preconfigured filter runner to use</param>
+        /// <param name="bucketName">Name of the bucket to filter on</param>
+        private void ExecuteFilterOnBucketDB(FilterRunner filterRunner, string bucketName)
+        {
+            var items = GetItemsForBucketDB(bucketName);
+            if (items == null)
+                return;
+
+            // Filter all items in the current key
+            List<long> newItems = [];
+            foreach (var item in items)
+            {
+                if (item.Value.PassesFilterDB(filterRunner))
+                    newItems.Add(item.Key);
+            }
+
+            // Set the value in the key to the new set
+            ItemsDB._buckets[bucketName] = newItems;
+        }
+
         /// <summary>
         /// Use game descriptions as names, updating cloneof/romof/sampleof
         /// </summary>
diff --git a/SabreTools.DatFiles/ItemDictionary.cs b/SabreTools.DatFiles/ItemDictionary.cs
index 568125c8..0503f9d7 100644
--- a/SabreTools.DatFiles/ItemDictionary.cs
+++ b/SabreTools.DatFiles/ItemDictionary.cs
@@ -8,7 +8,6 @@ using System.Threading.Tasks;
 #endif
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core.Filter;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
@@ -827,58 +826,6 @@ namespace SabreTools.DatFiles
 
         #endregion
 
-        // TODO: All internal, can this be put into a better location?
-        #region Filtering
-
-        /// <summary>
-        /// Execute all filters in a filter runner on the items in the dictionary
-        /// </summary>
-        /// <param name="filterRunner">Preconfigured filter runner to use</param>
-        internal void ExecuteFilters(FilterRunner filterRunner)
-        {
-            List<string> keys = [.. Keys];
-#if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
-#elif NET40_OR_GREATER
-            Parallel.ForEach(keys, key =>
-#else
-            foreach (var key in keys)
-#endif
-            {
-                ExecuteFilterOnBucket(filterRunner, key);
-#if NET40_OR_GREATER || NETCOREAPP
-            });
-#else
-            }
-#endif
-        }
-
-        /// <summary>
-        /// Execute all filters in a filter runner on a single bucket
-        /// </summary>
-        /// <param name="filterRunner">Preconfigured filter runner to use</param>
-        /// <param name="bucketName">Name of the bucket to filter on</param>
-        private void ExecuteFilterOnBucket(FilterRunner filterRunner, string bucketName)
-        {
-            List<DatItem>? items = GetItemsForBucket(bucketName);
-            if (items == null)
-                return;
-
-            // Filter all items in the current key
-            List<DatItem> newItems = [];
-            foreach (var item in items)
-            {
-                if (item.PassesFilter(filterRunner))
-                    newItems.Add(item);
-            }
-
-            // Set the value in the key to the new set
-            Remove(bucketName);
-            Add(bucketName, newItems);
-        }
-
-        #endregion
-
         #region Statistics
 
         /// <summary>
diff --git a/SabreTools.DatFiles/ItemDictionaryDB.cs b/SabreTools.DatFiles/ItemDictionaryDB.cs
index 5e298119..f4658fa7 100644
--- a/SabreTools.DatFiles/ItemDictionaryDB.cs
+++ b/SabreTools.DatFiles/ItemDictionaryDB.cs
@@ -10,7 +10,6 @@ using System.Threading.Tasks;
 #endif
 using System.Xml.Serialization;
 using Newtonsoft.Json;
-using SabreTools.Core.Filter;
 using SabreTools.Core.Tools;
 using SabreTools.DatItems;
 using SabreTools.DatItems.Formats;
@@ -1206,57 +1205,6 @@ namespace SabreTools.DatFiles
 
         #endregion
 
-        // TODO: All internal, can this be put into a better location?
-        #region Filtering
-
-        /// <summary>
-        /// Execute all filters in a filter runner on the items in the dictionary
-        /// </summary>
-        /// <param name="filterRunner">Preconfigured filter runner to use</param>
-        internal void ExecuteFilters(FilterRunner filterRunner)
-        {
-            List<string> keys = [.. SortedKeys];
-#if NET452_OR_GREATER || NETCOREAPP
-            Parallel.ForEach(keys, Core.Globals.ParallelOptions, key =>
-#elif NET40_OR_GREATER
-            Parallel.ForEach(keys, key =>
-#else
-            foreach (var key in keys)
-#endif
-            {
-                ExecuteFilterOnBucket(filterRunner, key);
-#if NET40_OR_GREATER || NETCOREAPP
-            });
-#else
-            }
-#endif
-        }
-
-        /// <summary>
-        /// Execute all filters in a filter runner on a single bucket
-        /// </summary>
-        /// <param name="filterRunner">Preconfigured filter runner to use</param>
-        /// <param name="bucketName">Name of the bucket to filter on</param>
-        private void ExecuteFilterOnBucket(FilterRunner filterRunner, string bucketName)
-        {
-            var items = GetItemsForBucket(bucketName);
-            if (items == null)
-                return;
-
-            // Filter all items in the current key
-            List<long> newItems = [];
-            foreach (var item in items)
-            {
-                if (item.Value.PassesFilterDB(filterRunner))
-                    newItems.Add(item.Key);
-            }
-
-            // Set the value in the key to the new set
-            _buckets[bucketName] = newItems;
-        }
-
-        #endregion
-
         #region Statistics
 
         /// <summary>