diff --git a/src/EcsMask.cs b/src/EcsMask.cs
deleted file mode 100644
index 53ace7c..0000000
--- a/src/EcsMask.cs
+++ /dev/null
@@ -1,379 +0,0 @@
-using System;
-using System.Runtime.CompilerServices;
-using System.Reflection;
-
-namespace DCFApixels.DragonECS
-{
-    #region Incs/Excs base
-    public interface IMaskCondition
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>;
-    }
-    #endregion
-
-    #region Incs
-    public interface IInc : IMaskCondition { }
-    public struct Inc : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype> => Array.Empty<int>();
-    }
-    public struct Inc<T0> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4, T5> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4, T5, T6> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T6>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4, T5, T6, T7> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T6>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T7>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4, T5, T6, T7, T8> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T6>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T7>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T8>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T6>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T7>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T8>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T9>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T6>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T7>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T8>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T9>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T10>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Inc<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11> : IInc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T6>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T7>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T8>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T9>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T10>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T11>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    #endregion
-
-    #region Excs
-    public interface IExc : IMaskCondition { }
-    public struct Exc : IExc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype> => Array.Empty<int>();
-    }
-    public struct Exc<T0> : IExc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Exc<T0, T1> : IExc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Exc<T0, T1, T2> : IExc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Exc<T0, T1, T2, T3> : IExc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Exc<T0, T1, T2, T3, T4> : IExc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    public struct Exc<T0, T1, T2, T3, T4, T5> : IExc
-    {
-        public int[] GetComponentsIDs<TWorldArchetype>() where TWorldArchetype : EcsWorld<TWorldArchetype>
-        {
-            return new int[]
-            {
-                WorldMetaStorage.GetComponentId<T0>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T1>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T2>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T3>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T4>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-                WorldMetaStorage.GetComponentId<T5>(WorldMetaStorage.GetWorldId<TWorldArchetype>()),
-            };
-        }
-    }
-    #endregion
-
-    #region EcsMask
-
-
-    public sealed class EcsMask : EcsComponentMask
-    {
-        internal readonly int UniqueID;
-        internal EcsMask(Type worldArchetypeType, int uniqueID, int[] inc, int[] exc)
-        {
-            WorldArchetypeType = worldArchetypeType;
-            UniqueID = uniqueID;
-            Inc = inc;
-            Exc = exc;
-        }
-    }
-
-    public static class EcsMaskMap<TWorldArchetype>
-        where TWorldArchetype : EcsWorld<TWorldArchetype>
-    {
-        private static int _count;
-        private static int _capacity;
-
-        public static int Count
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => _count;
-        }
-        public static int Capacity
-        {
-            [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            get => _capacity;
-        }
-
-        public static EcsMask GetMask<TInc, TExc>()
-            where TInc : struct, IInc
-            where TExc : struct, IExc
-        {
-            return Activator<TInc, TExc>.instance;
-        }
-
-        private class Activator<TInc, TExc>
-            where TInc : struct, IInc
-            where TExc : struct, IExc
-        {
-            static Activator()
-            {
-                var inc_ = new TInc().GetComponentsIDs<TWorldArchetype>();
-                var exc_ = new TExc().GetComponentsIDs<TWorldArchetype>();
-                Array.Sort(inc_);
-                Array.Sort(exc_);
-            
-                Type thisType = typeof(Activator<TInc, TExc>);
-            
-                Type sortedIncType = typeof(TInc);
-                if (sortedIncType.IsGenericType)
-                {
-                    Type[] sortedInc = new Type[inc_.Length];
-                    for (int i = 0; i < sortedInc.Length; i++)
-                        sortedInc[i] =  EcsWorld<TWorldArchetype>.ComponentType.types[inc_[i]];
-                    sortedIncType = sortedIncType.GetGenericTypeDefinition().MakeGenericType(sortedInc);
-                }
-                Type sortedExcType = typeof(TExc);
-                if (sortedExcType.IsGenericType)
-                {
-                    Type[] sortedExc = new Type[exc_.Length];
-                    for (int i = 0; i < sortedExc.Length; i++)
-                        sortedExc[i] = EcsWorld<TWorldArchetype>.ComponentType.types[exc_[i]];
-                    sortedExcType = sortedExcType.GetGenericTypeDefinition().MakeGenericType(sortedExc);
-                }
-            
-                Type targetType = typeof(Activator<,>).MakeGenericType(typeof(TWorldArchetype), sortedIncType, sortedExcType);
-            
-                if (targetType != thisType)
-                {
-                    instance = (EcsMask)targetType.GetField(nameof(instance), BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic).GetValue(null);
-                    return;
-                }
-            
-                var uniqueID = _count++;
-                if (_count >= _capacity)
-                    _capacity <<= 1;
-            
-                instance = new EcsMask(typeof(TWorldArchetype), uniqueID, inc_, exc_);
-            }
-
-            public readonly static EcsMask instance;
-        }
-    }
-    #endregion
-}
diff --git a/src/EcsWorld.cs b/src/EcsWorld.cs
index ab93668..3056aa0 100644
--- a/src/EcsWorld.cs
+++ b/src/EcsWorld.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using static DCFApixels.DragonECS.WorldMetaStorage;
 
 namespace DCFApixels.DragonECS
 {
@@ -155,11 +154,6 @@ namespace DCFApixels.DragonECS
         #endregion
 
         #region IsMaskCompatible
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public bool IsMaskCompatible<TInc, TExc>(int entityID) where TInc : struct, IInc where TExc : struct, IExc
-        {
-            return IsMaskCompatible(EcsMaskMap<TWorldArchetype>.GetMask<TInc, TExc>(), entityID);
-        }
         public bool IsMaskCompatible(EcsComponentMask mask, int entityID)
         {
 #if (DEBUG && !DISABLE_DRAGONECS_DEBUG) || !DRAGONECS_NO_SANITIZE_CHECKS
diff --git a/src/Interfaces/IEcsTable.cs b/src/Interfaces/IEcsTable.cs
index dc6517e..d2d9909 100644
--- a/src/Interfaces/IEcsTable.cs
+++ b/src/Interfaces/IEcsTable.cs
@@ -20,7 +20,6 @@ namespace DCFApixels.DragonECS
         public TQuery Where<TQuery>(out TQuery query) where TQuery : EcsQueryBase;
         public TQuery Select<TQuery>() where TQuery : EcsQueryBase;
 
-        public bool IsMaskCompatible<TInc, TExc>(int entityID) where TInc : struct, IInc where TExc : struct, IExc;
         public bool IsMaskCompatible(EcsComponentMask mask, int entityID);
 
         public void Destroy();
@@ -32,12 +31,4 @@ namespace DCFApixels.DragonECS
         internal void ReleaseGroup(EcsGroup group);
         #endregion
     }
-
-    public static class IEcsReadonlyTableExtensions
-    {
-        public static bool IsMaskCompatible<TInc>(this IEcsTable self, int entityID) where TInc : struct, IInc
-        {
-            return self.IsMaskCompatible<TInc, Exc>(entityID);
-        }
-    }
 }