diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal/Attributes/CombinationGroupingAttribute.cs b/Analyzers/Terminal.Gui.Analyzers.Internal/Attributes/CombinationGroupingAttribute.cs
deleted file mode 100644
index 22d8eafd3..000000000
--- a/Analyzers/Terminal.Gui.Analyzers.Internal/Attributes/CombinationGroupingAttribute.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;
-using JetBrains.Annotations;
-
-namespace Terminal.Gui.Analyzers.Internal.Attributes;
-
-/// <summary>
-///     Designates an enum member for inclusion in generation of bitwise combinations with other members decorated with
-///     this attribute which have the same <see cref="GroupTag"/> value.<br/>
-/// </summary>
-/// <remarks>
-///     This attribute is only considered for members of enum types which have the
-///     <see cref="GenerateEnumExtensionMethodsAttribute"/>.
-/// </remarks>
-[AttributeUsage (AttributeTargets.Field)]
-[UsedImplicitly]
-internal sealed class CombinationGroupingAttribute : Attribute
-{
-    /// <summary>
-    ///     Name of a group this member participates in, for FastHasFlags.
-    /// </summary>
-    public string GroupTag { get; set; }
-}
diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal/Attributes/GenerateEnumMemberCombinationsAttribute.cs b/Analyzers/Terminal.Gui.Analyzers.Internal/Attributes/GenerateEnumMemberCombinationsAttribute.cs
deleted file mode 100644
index 77d0c13a2..000000000
--- a/Analyzers/Terminal.Gui.Analyzers.Internal/Attributes/GenerateEnumMemberCombinationsAttribute.cs
+++ /dev/null
@@ -1,110 +0,0 @@
-// ReSharper disable RedundantUsingDirective
-
-using System;
-using JetBrains.Annotations;
-using Terminal.Gui.Analyzers.Internal.Compatibility;
-
-namespace Terminal.Gui.Analyzers.Internal.Attributes;
-
-/// <summary>
-///     Designates an enum member for inclusion in generation of bitwise combinations with other members decorated with
-///     this attribute which have the same <see cref="GroupTag"/> value.<br/>
-/// </summary>
-/// <remarks>
-///     <para>
-///         This attribute is only considered for enum types with the <see cref="GenerateEnumExtensionMethodsAttribute"/>.
-///     </para>
-/// </remarks>
-[AttributeUsage (AttributeTargets.Enum)]
-[UsedImplicitly]
-public sealed class GenerateEnumMemberCombinationsAttribute : System.Attribute
-{
-    private const byte MaximumPopCountLimit = 14;
-    private uint _mask;
-    private uint _maskPopCount;
-    private byte _popCountLimit = 8;
-    /// <inheritdoc cref="CombinationGroupingAttribute.GroupTag" />
-    public string GroupTag { get; set; }
-
-    /// <summary>
-    /// The mask for the group defined in <see cref="GroupTag"/>
-    /// </summary>
-    public uint Mask
-    {
-        get => _mask;
-        set
-        {
-#if NET8_0_OR_GREATER
-            _maskPopCount = uint.PopCount (value);
-#else
-            _maskPopCount = value.GetPopCount ();
-#endif
-            PopCountLimitExceeded = _maskPopCount > PopCountLimit;
-            MaximumPopCountLimitExceeded = _maskPopCount > MaximumPopCountLimit;
-
-            if (PopCountLimitExceeded || MaximumPopCountLimitExceeded)
-            {
-                return;
-            }
-
-            _mask = value;
-        }
-    }
-
-    /// <summary>
-    ///     The maximum number of bits allowed to be set to 1 in <see cref="Mask"/>.
-    /// </summary>
-    /// <remarks>
-    ///     <para>
-    ///         Default: 8 (256 possible combinations)
-    ///     </para>
-    ///     <para>
-    ///         Increasing this value is not recommended!<br/>
-    ///         Decreasing this value is pointless unless you want to limit maximum possible generated combinations even
-    ///         further.
-    ///     </para>
-    ///     <para>
-    ///         If the result of <see cref="NumericExtensions.GetPopCount(uint)"/>(<see cref="Mask"/>) exceeds 2 ^
-    ///         <see cref="PopCountLimit"/>, no
-    ///         combinations will be generated for the members which otherwise would have been included by <see cref="Mask"/>.
-    ///         Values exceeding the actual population count of <see cref="Mask"/> have no effect.
-    ///     </para>
-    ///     <para>
-    ///         This option is set to a sane default of 8, but also has a hard-coded limit of 14 (16384 combinations), as a
-    ///         protection against generation of extremely large files.
-    ///     </para>
-    ///     <para>
-    ///         CAUTION: The maximum number of possible combinations possible is equal to 1 &lt;&lt;
-    ///         <see cref="NumericExtensions.GetPopCount(uint)"/>(<see cref="Mask"/>).
-    ///         See <see cref="MaximumPopCountLimit"/> for hard-coded limit,
-    ///     </para>
-    /// </remarks>
-    public byte PopCountLimit
-    {
-        get => _popCountLimit;
-        set
-        {
-#if NET8_0_OR_GREATER
-            _maskPopCount = uint.PopCount (_mask);
-#else
-            _maskPopCount = _mask.GetPopCount ();
-#endif
-
-            PopCountLimitExceeded = _maskPopCount > value;
-            MaximumPopCountLimitExceeded = _maskPopCount > MaximumPopCountLimit;
-
-            if (PopCountLimitExceeded || MaximumPopCountLimitExceeded)
-            {
-                return;
-            }
-
-            _mask = value;
-            _popCountLimit = value;
-        }
-    }
-
-    [UsedImplicitly]
-    internal bool MaximumPopCountLimitExceeded { get; private set; }
-    [UsedImplicitly]
-    internal bool PopCountLimitExceeded { get; private set; }
-}
diff --git a/Analyzers/Terminal.Gui.Analyzers.Internal/Generators/EnumExtensions/EnumMemberCombinationsGenerator.cs b/Analyzers/Terminal.Gui.Analyzers.Internal/Generators/EnumExtensions/EnumMemberCombinationsGenerator.cs
deleted file mode 100644
index 82753d078..000000000
--- a/Analyzers/Terminal.Gui.Analyzers.Internal/Generators/EnumExtensions/EnumMemberCombinationsGenerator.cs
+++ /dev/null
@@ -1,130 +0,0 @@
-using System.Text;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.Text;
-using Terminal.Gui.Analyzers.Internal.Attributes;
-using Terminal.Gui.Analyzers.Internal.Constants;
-
-namespace Terminal.Gui.Analyzers.Internal.Generators.EnumExtensions;
-
-/// <summary>
-/// Implementation of <see cref="IIncrementalGenerator"/> for types decorated with <see cref="GenerateEnumMemberCombinationsAttribute"/>.
-/// </summary>
-[Generator]
-internal sealed class EnumMemberCombinationsGenerator : IIncrementalGenerator
-{
-    private const string AttributeCodeText = $$"""
-                                               {{Strings.Templates.StandardHeader}}
-                                               
-                                               namespace {{Strings.AnalyzersAttributesNamespace}};
-                                               
-                                               /// <summary>
-                                               ///     Designates an enum member for inclusion in generation of bitwise combinations with other members decorated with
-                                               ///     this attribute which have the same <see cref="{{nameof (GenerateEnumMemberCombinationsAttribute.GroupTag)}}"/> value.<br/>
-                                               /// </summary>
-                                               /// <remarks>
-                                               ///     <para>
-                                               ///         This attribute is only considered for enum types with the <see cref="{{nameof (GenerateEnumMemberCombinationsAttribute)}}"/>.
-                                               ///     </para>
-                                               ///     <para>
-                                               ///         Masks with more than 8 bits set will
-                                               ///     </para>
-                                               /// </remarks>
-                                               [AttributeUsageAttribute(AttributeTargets.Enum)]
-                                               internal sealed class {{nameof (GenerateEnumMemberCombinationsAttribute)}} : System.Attribute
-                                               {
-                                                   public const byte MaximumPopCountLimit = 14;
-                                                   private uint _mask;
-                                                   private uint _maskPopCount;
-                                                   private byte _popCountLimit = 8;
-                                                   public required string GroupTag { get; set; }
-                                               
-                                                   public required uint Mask
-                                                   {
-                                                       get => _mask;
-                                                       set
-                                                       {
-                                                           _maskPopCount = uint.PopCount(value);
-                                               
-                                                           PopCountLimitExceeded = _maskPopCount > PopCountLimit;
-                                                           MaximumPopCountLimitExceeded = _maskPopCount > MaximumPopCountLimit;
-                                               
-                                                           if (PopCountLimitExceeded || MaximumPopCountLimitExceeded)
-                                                           {
-                                                               return;
-                                                           }
-                                               
-                                                           _mask = value;
-                                                       }
-                                                   }
-                                               
-                                                   /// <summary>
-                                                   ///     The maximum number of bits allowed to be set to 1 in <see cref="{{nameof (GenerateEnumMemberCombinationsAttribute.Mask)}}"/>.
-                                                   /// </summary>
-                                                   /// <remarks>
-                                                   ///     <para>
-                                                   ///         Default: 8 (256 possible combinations)
-                                                   ///     </para>
-                                                   ///     <para>
-                                                   ///         Increasing this value is not recommended!<br/>
-                                                   ///         Decreasing this value is pointless unless you want to limit maximum possible generated combinations even
-                                                   ///         further.
-                                                   ///     </para>
-                                                   ///     <para>
-                                                   ///         If the result of <see cref="uint.PopCount"/>(<see cref="{{nameof (GenerateEnumMemberCombinationsAttribute.Mask)}}"/>) exceeds 2 ^ <see cref="PopCountLimit"/>, no
-                                                   ///         combinations will be generated for the members which otherwise would have been included by <see cref="{{nameof (GenerateEnumMemberCombinationsAttribute.Mask)}}"/>.
-                                                   ///         Values exceeding the actual population count of <see cref="{{nameof (GenerateEnumMemberCombinationsAttribute.Mask)}}"/> have no effect.
-                                                   ///     </para>
-                                                   ///     <para>
-                                                   ///         This option is set to a sane default of 8, but also has a hard-coded limit of 14 (16384 combinations), as a
-                                                   ///         protection against generation of extremely large files.
-                                                   ///     </para>
-                                                   ///     <para>
-                                                   ///         CAUTION: The maximum number of possible combinations possible is equal to 1 &lt;&lt;
-                                                   ///         <see cref="uint.PopCount"/>(<see cref="{{nameof (GenerateEnumMemberCombinationsAttribute.Mask)}}"/>).
-                                                   ///         See <see cref="MaximumPopCountLimit"/> for hard-coded limit,
-                                                   ///     </para>
-                                                   /// </remarks>
-                                                   public byte PopCountLimit
-                                                   {
-                                                       get => _popCountLimit;
-                                                       set
-                                                       {
-                                                           _maskPopCount = uint.PopCount(_mask);
-                                               
-                                                           PopCountLimitExceeded = _maskPopCount > value;
-                                                           MaximumPopCountLimitExceeded = _maskPopCount > MaximumPopCountLimit;
-                                               
-                                                           if (PopCountLimitExceeded || MaximumPopCountLimitExceeded)
-                                                           {
-                                                               return;
-                                                           }
-                                               
-                                                           _mask = value;
-                                                           _popCountLimit = value;
-                                                       }
-                                                   }
-                                               
-                                                   internal bool MaximumPopCountLimitExceeded { get; private set; }
-                                                   internal bool PopCountLimitExceeded { get; private set; }
-                                               }
-
-                                               """;
-
-    private const string AttributeFullyQualifiedName = $"{Strings.AnalyzersAttributesNamespace}.{AttributeName}";
-    private const string AttributeName = "GenerateEnumMemberCombinationsAttribute";
-
-    /// <inheritdoc/>
-    public void Initialize (IncrementalGeneratorInitializationContext context)
-    {
-        context.RegisterPostInitializationOutput (GenerateAttributeCode);
-
-        return;
-
-        static void GenerateAttributeCode (IncrementalGeneratorPostInitializationContext initContext)
-        {
-#pragma warning disable IDE0061 // Use expression body for local function
-            initContext.AddSource ($"{AttributeFullyQualifiedName}.g.cs", SourceText.From (AttributeCodeText, Encoding.UTF8));
-#pragma warning restore IDE0061 // Use expression body for local function
-        }
-    }
-}