DatItems don't know about filtering

SabreTools.DatItems/Adjuster.cs

@@ -153,34 +153,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on default
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Default, Default))
-                return false;
-
-            // Filter on individual conditions
-            if (ConditionsSpecified)
-            {
-                foreach (Condition condition in Conditions)
-                {
-                    if (!condition.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Analog.cs

@@ -91,20 +91,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on mask
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Analog_Mask, Mask))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Archive.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -106,20 +105,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/BiosSet.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -134,28 +133,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on description
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Description, Description))
-                return false;
-
-            // Filter on default
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Default, Default))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Chip.cs

@@ -6,7 +6,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -152,34 +151,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // DatItem_Tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
-                return false;
-
-            // DatItem_ChipType
-            if (cleaner.DatItemFilter.ChipType.MatchesPositive(ChipType.NULL, ChipType) == false)
-                return false;
-            if (cleaner.DatItemFilter.ChipType.MatchesNegative(ChipType.NULL, ChipType) == true)
-                return false;
-
-            // DatItem_Clock
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Clock, Clock))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Condition.cs

@@ -4,7 +4,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -165,57 +164,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            if (sub)
-            {
-                // Filter on tag
-                if (!Filter.PassStringFilter(cleaner.DatItemFilter.Condition_Tag, Tag))
-                    return false;
-
-                // Filter on mask
-                if (!Filter.PassStringFilter(cleaner.DatItemFilter.Condition_Mask, Mask))
-                    return false;
-
-                // Filter on relation
-                if (cleaner.DatItemFilter.Condition_Relation.MatchesPositive(Relation.NULL, Relation) == false)
-                    return false;
-                if (cleaner.DatItemFilter.Condition_Relation.MatchesNegative(Relation.NULL, Relation) == true)
-                    return false;
-
-                // Filter on value
-                if (!Filter.PassStringFilter(cleaner.DatItemFilter.Condition_Value, Value))
-                    return false;
-            }
-            else
-            {
-                // Filter on tag
-                if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
-                    return false;
-
-                // Filter on mask
-                if (!Filter.PassStringFilter(cleaner.DatItemFilter.Mask, Mask))
-                    return false;
-
-                // Filter on relation
-                if (cleaner.DatItemFilter.Relation.MatchesPositive(Relation.NULL, Relation) == false)
-                    return false;
-                if (cleaner.DatItemFilter.Relation.MatchesNegative(Relation.NULL, Relation) == true)
-                    return false;
-
-                // Filter on value
-                if (!Filter.PassStringFilter(cleaner.DatItemFilter.Value, Value))
-                    return false;
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Configuration.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -218,58 +217,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
-                return false;
-
-            // Filter on mask
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Mask, Mask))
-                return false;
-
-            // Filter on individual conditions
-            if (ConditionsSpecified)
-            {
-                foreach (Condition condition in Conditions)
-                {
-                    if (!condition.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            // Filter on individual locations
-            if (LocationsSpecified)
-            {
-                foreach (Location location in Locations)
-                {
-                    if (!location.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            // Filter on individual conditions
-            if (SettingsSpecified)
-            {
-                foreach (Setting setting in Settings)
-                {
-                    if (!setting.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Control.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -255,66 +254,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on control type
-            if (cleaner.DatItemFilter.Control_Type.MatchesPositive(ControlType.NULL, ControlType) == false)
-                return false;
-            if (cleaner.DatItemFilter.Control_Type.MatchesNegative(ControlType.NULL, ControlType) == true)
-                return false;
-
-            // Filter on player
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Player, Player))
-                return false;
-
-            // Filter on buttons
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Buttons, Buttons))
-                return false;
-
-            // Filter on reqbuttons
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_ReqButtons, RequiredButtons))
-                return false;
-
-            // Filter on minimum
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Minimum, Minimum))
-                return false;
-
-            // Filter on maximum
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Maximum, Maximum))
-                return false;
-
-            // Filter on sensitivity
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_Sensitivity, Sensitivity))
-                return false;
-
-            // Filter on keydelta
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Control_KeyDelta, KeyDelta))
-                return false;
-
-            // Filter on reverse
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Control_Reverse, Reverse))
-                return false;
-
-            // Filter on ways
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Control_Ways, Ways))
-                return false;
-
-            // Filter on ways2
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Control_Ways2, Ways2))
-                return false;
-
-            // Filter on ways3
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Control_Ways3, Ways3))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/DatItem.cs

@@ -460,29 +460,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <summary>
-        /// Check to see if a DatItem passes the filter
-        /// </summary>
-        /// <param name="cleaner">Cleaner containing filters to check against</param>
-        /// <param name="sub">True if this is a subitem, false otherwise</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public virtual bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Filter on machine fields
-            if (!Machine.PassesFilter(cleaner))
-                return false;
-
-            // Filters for if we're a top-level item
-            if (!sub)
-            {
-                // Filter on item type
-                if (!Filter.PassStringFilter(cleaner.DatItemFilter.Type, ItemType.ToString()))
-                    return false;
-            }
-
-            return true;
-        }
-
         /// <summary>
         /// Remove fields from the DatItem
         /// </summary>

SabreTools.DatItems/DataArea.cs

@@ -6,7 +6,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -154,34 +153,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on area name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.AreaName, Name))
-                return false;
-
-            // Filter on area size
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.AreaSize, Size))
-                return false;
-
-            // Filter on area width
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.AreaWidth, Width))
-                return false;
-
-            // Filter on area endianness
-            if (cleaner.DatItemFilter.AreaEndianness.MatchesPositive(Endianness.NULL, Endianness) == false)
-                return false;
-            if (cleaner.DatItemFilter.AreaEndianness.MatchesNegative(Endianness.NULL, Endianness) == true)
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Device.cs

@@ -4,7 +4,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -210,58 +209,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on device type
-            if (cleaner.DatItemFilter.DeviceType.MatchesPositive(DeviceType.NULL, DeviceType) == false)
-                return false;
-            if (cleaner.DatItemFilter.DeviceType.MatchesNegative(DeviceType.NULL, DeviceType) == true)
-                return false;
-
-            // Filter on tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
-                return false;
-
-            // Filter on fixed image
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.FixedImage, FixedImage))
-                return false;
-
-            // Filter on mandatory
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Mandatory, Mandatory))
-                return false;
-
-            // Filter on interface
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Interface, Interface))
-                return false;
-
-            // Filter on individual instances
-            if (InstancesSpecified)
-            {
-                foreach (Instance instance in Instances)
-                {
-                    if (!instance.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            // Filter on individual extensions
-            if (ExtensionsSpecified)
-            {
-                foreach (Extension extension in Extensions)
-                {
-                    if (!extension.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/DeviceReference.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -106,20 +105,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/DipSwitch.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -265,73 +264,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            #region Common
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
-                return false;
-
-            // Filter on mask
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Mask, Mask))
-                return false;
-
-            // Filter on individual conditions
-            if (ConditionsSpecified)
-            {
-                foreach (Condition condition in Conditions)
-                {
-                    if (!condition.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            // Filter on individual locations
-            if (LocationsSpecified)
-            {
-                foreach (Location location in Locations)
-                {
-                    if (!location.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            // Filter on individual conditions
-            if (ValuesSpecified)
-            {
-                foreach (Setting value in Values)
-                {
-                    if (!value.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            #endregion
-
-            #region SoftwareList
-
-            // Filter on Part
-            if (PartSpecified)
-            {
-                if (!Part.PassesFilter(cleaner, true))
-                    return false;
-            }
-
-            #endregion
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Disk.cs

@@ -6,7 +6,6 @@ using System.Xml.Serialization;
 using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -425,76 +424,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            #region Common
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on MD5
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.MD5, MD5))
-                return false;
-
-            // Filter on SHA-1
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA1, SHA1))
-                return false;
-
-            // Filter on merge tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Merge, MergeTag))
-                return false;
-
-            // Filter on region
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Region, Region))
-                return false;
-
-            // Filter on index
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Index, Index))
-                return false;
-
-            // Filter on writable
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Writable, Writable))
-                return false;
-
-            // Filter on status
-            if (cleaner.DatItemFilter.Status.MatchesPositive(ItemStatus.NULL, ItemStatus) == false)
-                return false;
-            if (cleaner.DatItemFilter.Status.MatchesNegative(ItemStatus.NULL, ItemStatus) == true)
-                return false;
-
-            // Filter on optional
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Optional, Optional))
-                return false;
-
-            #endregion
-
-            #region SoftwareList
-
-            // Filter on DiskArea
-            if (DiskAreaSpecified)
-            {
-                if (!DiskArea.PassesFilter(cleaner, true))
-                    return false;
-            }
-
-            // Filter on Part
-            if (PartSpecified)
-            {
-                if (!Part.PassesFilter(cleaner, true))
-                    return false;
-            }
-
-            #endregion
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/DiskArea.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -108,20 +107,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on area name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.AreaName, Name))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Display.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -294,74 +293,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
-                return false;
-
-            // Filter on display type
-            if (cleaner.DatItemFilter.DisplayType.MatchesPositive(DisplayType.NULL, DisplayType) == false)
-                return false;
-            if (cleaner.DatItemFilter.DisplayType.MatchesNegative(DisplayType.NULL, DisplayType) == true)
-                return false;
-
-            // Filter on rotation
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Rotate, Rotate))
-                return false;
-
-            // Filter on flipx
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.FlipX, FlipX))
-                return false;
-
-            // Filter on width
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Width, Width))
-                return false;
-
-            // Filter on height
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Height, Height))
-                return false;
-
-            // Filter on refresh
-            if (!Filter.PassDoubleFilter(cleaner.DatItemFilter.Refresh, Refresh))
-                return false;
-
-            // Filter on pixclock
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.PixClock, PixClock))
-                return false;
-
-            // Filter on htotal
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.HTotal, HTotal))
-                return false;
-
-            // Filter on hbend
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.HBEnd, HBEnd))
-                return false;
-
-            // Filter on hbstart
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.HBStart, HBStart))
-                return false;
-
-            // Filter on vtotal
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.VTotal, VTotal))
-                return false;
-
-            // Filter on vbend
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.VBEnd, VBEnd))
-                return false;
-
-            // Filter on vbstart
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.VBStart, VBStart))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Driver.cs

@@ -4,7 +4,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -146,40 +145,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on status
-            if (cleaner.DatItemFilter.SupportStatus.MatchesPositive(SupportStatus.NULL, Status) == false)
-                return false;
-            if (cleaner.DatItemFilter.SupportStatus.MatchesNegative(SupportStatus.NULL, Status) == true)
-                return false;
-
-            // Filter on emulation
-            if (cleaner.DatItemFilter.EmulationStatus.MatchesPositive(SupportStatus.NULL, Emulation) == false)
-                return false;
-            if (cleaner.DatItemFilter.EmulationStatus.MatchesNegative(SupportStatus.NULL, Emulation) == true)
-                return false;
-
-            // Filter on cocktail
-            if (cleaner.DatItemFilter.CocktailStatus.MatchesPositive(SupportStatus.NULL, Cocktail) == false)
-                return false;
-            if (cleaner.DatItemFilter.CocktailStatus.MatchesNegative(SupportStatus.NULL, Cocktail) == true)
-                return false;
-
-            // Filter on savestate
-            if (cleaner.DatItemFilter.SaveStateStatus.MatchesPositive(Supported.NULL, SaveState) == false)
-                return false;
-            if (cleaner.DatItemFilter.SaveStateStatus.MatchesNegative(Supported.NULL, SaveState) == true)
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Extension.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -106,20 +105,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Extension_Name, Name))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Feature.cs

@@ -4,7 +4,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -128,34 +127,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on type
-            if (cleaner.DatItemFilter.FeatureType.MatchesPositive(FeatureType.NULL, Type) == false)
-                return false;
-            if (cleaner.DatItemFilter.FeatureType.MatchesNegative(FeatureType.NULL, Type) == true)
-                return false;
-
-            // Filter on status
-            if (cleaner.DatItemFilter.FeatureStatus.MatchesPositive(FeatureStatus.NULL, Status) == false)
-                return false;
-            if (cleaner.DatItemFilter.FeatureStatus.MatchesNegative(FeatureStatus.NULL, Status) == true)
-                return false;
-
-            // Filter on overall
-            if (cleaner.DatItemFilter.FeatureOverall.MatchesPositive(FeatureStatus.NULL, Overall) == false)
-                return false;
-            if (cleaner.DatItemFilter.FeatureOverall.MatchesNegative(FeatureStatus.NULL, Overall) == true)
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Info.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -117,24 +116,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on info value
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Value, Value))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Input.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -174,42 +173,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on service
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Service, Service))
-                return false;
-
-            // Filter on tilt
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Tilt, Tilt))
-                return false;
-
-            // Filter on players
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Players, Players))
-                return false;
-
-            // Filter on coins
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Coins, Coins))
-                return false;
-
-            // Filter on individual controls
-            if (ControlsSpecified)
-            {
-                foreach (Control control in Controls)
-                {
-                    if (!control.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Instance.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -116,25 +115,7 @@ namespace SabreTools.DatItems
         #endregion
 
         #region Filtering
-
+        
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Instance_Name, Name))
-                return false;
-
-            // Filter on brief name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Instance_BriefName, BriefName))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Location.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -137,28 +136,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Location_Name, Name))
-                return false;
-
-            // Filter on number
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Location_Number, Number))
-                return false;
-
-            // Filter on inverted
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Location_Inverted, Inverted))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Machine.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -567,196 +566,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <summary>
-        /// Check to see if a Machine passes the filter
-        /// </summary>
-        /// <param name="cleaner">Cleaner containing filters to check against</param>
-        /// <returns>True if the item passed the filter, false otherwise</returns>
-        public bool PassesFilter(Cleaner cleaner)
-        {
-            #region Common
-
-            // Machine_Name
-            bool passes = Filter.PassStringFilter(cleaner.MachineFilter.Name, Name);
-            if (cleaner.MachineFilter.IncludeOfInGame)
-            {
-                passes |= Filter.PassStringFilter(cleaner.MachineFilter.Name, CloneOf);
-                passes |= Filter.PassStringFilter(cleaner.MachineFilter.Name, RomOf);
-            }
-            if (!passes)
-                return false;
-
-            // Machine_Comment
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Comment, Comment))
-                return false;
-
-            // Machine_Description
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Description, Description))
-                return false;
-
-            // Machine_Year
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Year, Year))
-                return false;
-
-            // Machine_Manufacturer
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Manufacturer, Manufacturer))
-                return false;
-
-            // Machine_Publisher
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Publisher, Publisher))
-                return false;
-
-            // Machine_Category
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Category, Category))
-                return false;
-
-            // Machine_RomOf
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.RomOf, RomOf))
-                return false;
-
-            // Machine_CloneOf
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.CloneOf, CloneOf))
-                return false;
-
-            // Machine_SampleOf
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.SampleOf, SampleOf))
-                return false;
-
-            // Machine_Type
-            if (cleaner.MachineFilter.Type.MatchesPositive(0x0, MachineType) == false)
-                return false;
-            if (cleaner.MachineFilter.Type.MatchesNegative(0x0, MachineType) == true)
-                return false;
-
-            #endregion
-
-            #region AttractMode
-
-            // Machine_Players
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Players, Players))
-                return false;
-
-            // Machine_Rotation
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Rotation, Rotation))
-                return false;
-
-            // Machine_Control
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Control, Control))
-                return false;
-
-            // Machine_Status
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Status, Status))
-                return false;
-
-            // Machine_DisplayCount
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.DisplayCount, DisplayCount))
-                return false;
-
-            // Machine_DisplayType
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.DisplayType, DisplayType))
-                return false;
-
-            // Machine_Buttons
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Buttons, Buttons))
-                return false;
-
-            #endregion
-
-            #region ListXML
-
-            // Machine_SourceFile
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.SourceFile, SourceFile))
-                return false;
-
-            // Machine_Runnable
-            if (cleaner.MachineFilter.Runnable.MatchesPositive(Runnable.NULL, Runnable) == false)
-                return false;
-            if (cleaner.MachineFilter.Runnable.MatchesNegative(Runnable.NULL, Runnable) == true)
-                return false;
-
-            #endregion
-
-            #region Logiqx
-
-            // Machine_Board
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Board, Board))
-                return false;
-
-            // Machine_RebuildTo
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.RebuildTo, RebuildTo))
-                return false;
-
-            #endregion
-
-            #region Logiqx EmuArc
-
-            // Machine_TitleID
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.TitleID, TitleID))
-                return false;
-
-            // Machine_Developer
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Developer, Developer))
-                return false;
-
-            // Machine_Genre
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Genre, Genre))
-                return false;
-
-            // Machine_Subgenre
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Subgenre, Subgenre))
-                return false;
-
-            // Machine_Ratings
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Ratings, Ratings))
-                return false;
-
-            // Machine_Score
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Score, Score))
-                return false;
-
-            // Machine_Enabled
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Enabled, Enabled))
-                return false;
-
-            // Machine_CRC
-            if (!Filter.PassBoolFilter(cleaner.MachineFilter.CRC, Crc))
-                return false;
-
-            // Machine_RelatedTo
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.RelatedTo, RelatedTo))
-                return false;
-
-            #endregion
-
-            #region OpenMSX
-
-            // Machine_GenMSXID
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.GenMSXID, GenMSXID))
-                return false;
-
-            // Machine_System
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.System, System))
-                return false;
-
-            // Machine_Country
-            if (!Filter.PassStringFilter(cleaner.MachineFilter.Country, Country))
-                return false;
-
-            #endregion
-
-            #region SoftwareList
-
-            // Machine_Supported
-            if (cleaner.MachineFilter.Supported.MatchesPositive(Supported.NULL, Supported) == false)
-                return false;
-            if (cleaner.MachineFilter.Supported.MatchesNegative(Supported.NULL, Supported) == true)
-                return false;
-
-            #endregion // SoftwareList
-
-            return true;
-        }
-
         /// <summary>
         /// Remove fields from the Machine
         /// </summary>

SabreTools.DatItems/Media.cs

@@ -7,7 +7,6 @@ using System.Xml.Serialization;
 using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -324,36 +323,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on MD5
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.MD5, MD5))
-                return false;
-
-            // Filter on SHA-1
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA1, SHA1))
-                return false;
-
-            // Filter on SHA-256
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA256, SHA256))
-                return false;
-
-            // Filter on SpamSum
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SpamSum, SpamSum))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Part.cs

@@ -5,7 +5,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -144,34 +143,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on part name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Part_Name, Name))
-                return false;
-
-            // Filter on part interface
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Part_Interface, Interface))
-                return false;
-
-            // Filter on features
-            if (FeaturesSpecified)
-            {
-                foreach (PartFeature partFeature in Features)
-                {
-                    if (!partFeature.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/PartFeature.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -117,24 +116,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Part_Feature_Name, Name))
-                return false;
-
-            // Filter on value
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Part_Feature_Value, Value))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Port.cs

@@ -3,7 +3,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -124,30 +123,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Tag, Tag))
-                return false;
-
-            // Filter on individual analogs
-            if (AnalogsSpecified)
-            {
-                foreach (Analog analog in Analogs)
-                {
-                    if (!analog.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/RamOption.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -132,28 +131,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on default
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Default, Default))
-                return false;
-
-            // Filter on content
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Content, Content))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Release.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -162,36 +161,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on region
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Region, Region))
-                return false;
-
-            // Filter on language
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Language, Language))
-                return false;
-
-            // Filter on date
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Date, Date))
-                return false;
-
-            // Filter on default
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Default, Default))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Rom.cs

@@ -8,7 +8,6 @@ using System.Xml.Serialization;
 using SabreTools.Core;
 using SabreTools.Core.Tools;
 using SabreTools.FileTypes;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -798,162 +797,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            #region Common
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on bios
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Bios, Bios))
-                return false;
-
-            // Filter on rom size
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Size, Size))
-                return false;
-
-            // Filter on CRC
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.CRC, CRC))
-                return false;
-
-            // Filter on MD5
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.MD5, MD5))
-                return false;
-
-#if NET_FRAMEWORK
-            // Filter on RIPEMD160
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.RIPEMD160, RIPEMD160))
-                return false;
-#endif
-
-            // Filter on SHA-1
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA1, SHA1))
-                return false;
-
-            // Filter on SHA-256
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA256, SHA256))
-                return false;
-
-            // Filter on SHA-384
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA384, SHA384))
-                return false;
-
-            // Filter on SHA-512
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SHA512, SHA512))
-                return false;
-
-            // Filter on SpamSum
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SpamSum, SpamSum))
-                return false;
-
-            // Filter on merge tag
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Merge, MergeTag))
-                return false;
-
-            // Filter on region
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Region, Region))
-                return false;
-
-            // Filter on offset
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Offset, Offset))
-                return false;
-
-            // Filter on date
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Date, Date))
-                return false;
-
-            // Filter on status
-            if (cleaner.DatItemFilter.Status.MatchesPositive(ItemStatus.NULL, ItemStatus) == false)
-                return false;
-            if (cleaner.DatItemFilter.Status.MatchesNegative(ItemStatus.NULL, ItemStatus) == true)
-                return false;
-
-            // Filter on optional
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Optional, Optional))
-                return false;
-
-            // Filter on inverted
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Inverted, Inverted))
-                return false;
-
-            #endregion
-
-            #region AttractMode
-
-            // Filter on alt name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.AltName, AltName))
-                return false;
-
-            // Filter on alt title
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.AltTitle, AltTitle))
-                return false;
-
-            #endregion
-
-            #region OpenMSX
-
-            // Filter on original
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Original, Original?.Content))
-                return false;
-
-            // Filter on OpenMSX subtype
-            if (cleaner.DatItemFilter.OpenMSXSubType.MatchesPositive(OpenMSXSubType.NULL, OpenMSXSubType) == false)
-                return false;
-            if (cleaner.DatItemFilter.OpenMSXSubType.MatchesNegative(OpenMSXSubType.NULL, OpenMSXSubType) == true)
-                return false;
-
-            // Filter on OpenMSX type
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.OpenMSXType, OpenMSXType))
-                return false;
-
-            // Filter on remark
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Remark, Remark))
-                return false;
-
-            // Filter on boot
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Boot, Boot))
-                return false;
-
-            #endregion
-
-            #region SoftwareList
-
-            // Filter on load flag
-            if (cleaner.DatItemFilter.LoadFlag.MatchesPositive(LoadFlag.NULL, LoadFlag) == false)
-                return false;
-            if (cleaner.DatItemFilter.LoadFlag.MatchesNegative(LoadFlag.NULL, LoadFlag) == true)
-                return false;
-
-            // Filter on value
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Value, Value))
-                return false;
-
-            // Filter on DataArea
-            if (DataAreaSpecified)
-            {
-                if (!DataArea.PassesFilter(cleaner, true))
-                    return false;
-            }
-
-            // Filter on Part
-            if (PartSpecified)
-            {
-                if (!Part.PassesFilter(cleaner, true))
-                    return false;
-            }
-
-            #endregion
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Sample.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -106,20 +105,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Setting.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -166,38 +165,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Setting_Name, Name))
-                return false;
-
-            // Filter on value
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Setting_Value, Value))
-                return false;
-
-            // Filter on default
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.Setting_Default, Default))
-                return false;
-
-            // Filter on individual conditions
-            if (ConditionsSpecified)
-            {
-                foreach (Condition condition in Conditions)
-                {
-                    if (!condition.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/SharedFeature.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -117,24 +116,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on value
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Value, Value))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Slot.cs

@@ -4,7 +4,6 @@ using System.Linq;
 using System.Xml.Serialization;
 
 using SabreTools.Core;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -138,30 +137,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on individual slot options
-            if (SlotOptionsSpecified)
-            {
-                foreach (SlotOption slotOption in SlotOptions)
-                {
-                    if (!slotOption.PassesFilter(cleaner, true))
-                        return false;
-                }
-            }
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/SlotOption.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -134,28 +133,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SlotOption_Name, Name))
-                return false;
-
-            // Filter on device name
-            if (!Filter.PassStringFilter(cleaner.DatItemFilter.SlotOption_DeviceName, DeviceName))
-                return false;
-
-            // Filter on default
-            if (!Filter.PassBoolFilter(cleaner.DatItemFilter.SlotOption_Default, Default))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/SoftwareList.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 
@@ -136,30 +135,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on item name
-            if (!Filtering.Filter.PassStringFilter(cleaner.DatItemFilter.Name, Name))
-                return false;
-
-            // Filter on status
-            if (cleaner.DatItemFilter.SoftwareListStatus.MatchesPositive(SoftwareListStatus.NULL, Status) == false)
-                return false;
-            if (cleaner.DatItemFilter.SoftwareListStatus.MatchesNegative(SoftwareListStatus.NULL, Status) == true)
-                return false;
-
-            // Filter on filter
-            if (!Filtering.Filter.PassStringFilter(cleaner.DatItemFilter.Filter, Filter))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatItems/Sound.cs

@@ -5,7 +5,6 @@ using System.Xml.Serialization;
 
 using SabreTools.Core;
 using SabreTools.Core.Tools;
-using SabreTools.Filtering;
 using Newtonsoft.Json;
 
 namespace SabreTools.DatItems
@@ -97,20 +96,6 @@ namespace SabreTools.DatItems
 
         #region Filtering
 
-        /// <inheritdoc/>
-        public override bool PassesFilter(Cleaner cleaner, bool sub = false)
-        {
-            // Check common fields first
-            if (!base.PassesFilter(cleaner, sub))
-                return false;
-
-            // Filter on channels
-            if (!Filter.PassLongFilter(cleaner.DatItemFilter.Channels, Channels))
-                return false;
-
-            return true;
-        }
-
         /// <inheritdoc/>
         public override void RemoveFields(
             List<DatItemField> datItemFields,

SabreTools.DatTools/Modification.cs

@@ -214,7 +214,7 @@ namespace SabreTools.DatTools
                             continue;
 
                         // If the rom doesn't pass the filter, mark for removal
-                        if (!item.PassesFilter(cleaner))
+                        if (!cleaner.PassesFilters(item))
                         {
                             item.Remove = true;