diff --git a/sdk/include/loki/HierarchyGenerators.h b/sdk/include/loki/HierarchyGenerators.h
index 16e882cd61c..17108017814 100644
--- a/sdk/include/loki/HierarchyGenerators.h
+++ b/sdk/include/loki/HierarchyGenerators.h
@@ -29,302 +29,9 @@
 #define HIERARCHYGENERATORS_INC_
 
 #include "Typelist.h"
-#include "TypeTraits.h"
-#include "EmptyType.h"
 
 namespace Loki
 {
-////////////////////////////////////////////////////////////////////////////////
-// class template GenScatterHierarchy
-// Generates a scattered hierarchy starting from a typelist and a template
-// Invocation (TList is a typelist, Model is a template of one arg):
-// GenScatterHierarchy<TList, Model>
-// The generated class inherits all classes generated by instantiating the 
-// template 'Model' with the types contained in TList 
-////////////////////////////////////////////////////////////////////////////////
-
-
-    template <typename T, template <typename> class Unit>
-    class GenScatterHierarchy;
-
-    namespace Private
-    {
-    // for some reason VC7 needs the base definition altough not in use
-    template <typename TListTag> 
-    struct GenScatterHierarchyHelper1
-    {
-        template <typename T, template <typename> class Unit>
-        struct In 
-        { 
-            typedef typename T::ERROR_THIS_INSTANCE_SELECTED Result; 
-        };
-    };
-
-    template <typename TListTag> 
-    struct GenScatterHierarchyHelper2
-    {
-        template <typename T, template <typename> class Unit>
-        struct In 
-        { 
-            typedef typename T::ERROR_THIS_INSTANCE_SELECTED Result; 
-        };
-    };
-
-    
-    template <> 
-    struct GenScatterHierarchyHelper1<TL::Typelist_tag>
-    {
-        template <class TList, template <typename> class Unit>
-        struct In
-        {
-            typedef GenScatterHierarchy<typename TList::Head, Unit> Result;
-        };
-    };
-
-    template <> 
-    struct GenScatterHierarchyHelper2<TL::Typelist_tag>
-    {
-        template <class TList, template <typename> class Unit>
-        struct In
-        {
-            typedef GenScatterHierarchy<typename TList::Tail, Unit> Result;
-        };
-    };
-    
-
-    template <> 
-    struct GenScatterHierarchyHelper1<TL::NoneList_tag>
-    {
-        template <typename AtomicType, template <typename> class Unit>
-        struct In { typedef Unit<AtomicType> Result; };
-    };
-
-    template <> 
-    struct GenScatterHierarchyHelper2<TL::NoneList_tag>
-    {
-        template <typename AtomicType, template <typename> class Unit>
-        struct In { struct Result {}; };        
-    };
-
-
-    template <> 
-    struct GenScatterHierarchyHelper1<TL::NullType_tag>
-    {
-        template <class TList, template <typename> class Unit>
-        struct In { struct Result {}; };        
-    };
-
-    template <> 
-    struct GenScatterHierarchyHelper2<TL::NullType_tag>
-    {
-        template <class TList, template <typename> class Unit>
-        struct In { struct Result {}; };        
-    };
-
-    } // namespace Private
-
-    template <typename T, template <typename> class Unit>
-    class GenScatterHierarchy
-        : public Private::GenScatterHierarchyHelper1
-          <
-            typename TL::is_Typelist<T>::type_tag
-          >
-          ::template In<T, Unit>::Result
-
-        , public Private::GenScatterHierarchyHelper2
-          <
-            typename TL::is_Typelist<T>::type_tag
-          >
-          ::template In<T, Unit>::Result
-    {
-    public:
-
-        typedef typename Private::GenScatterHierarchyHelper1
-        <
-            typename TL::is_Typelist<T>::type_tag
-        >
-        ::template In<T, Unit>::Result LeftBase;
-
-        typedef typename Private::GenScatterHierarchyHelper2
-        <
-            typename TL::is_Typelist<T>::type_tag
-        >
-        ::template In<T, Unit>::Result RightBase;
-    
-    
-        typedef typename Select
-        <
-            TL::is_Typelist<T>::value, T, void
-        >
-        ::Result TList;
-
-        template <typename T> struct Rebind
-        {
-            typedef Unit<T> Result;
-        };
-    };
-
-     
-////////////////////////////////////////////////////////////////////////////////
-// function template Field
-// Accesses a field in an object of a type generated with GenScatterHierarchy
-// Invocation (obj is an object of a type H generated with GenScatterHierarchy,
-//     T is a type in the typelist used to generate H):
-// Field<T>(obj)
-// returns a reference to Unit<T>, where Unit is the template used to generate H 
-////////////////////////////////////////////////////////////////////////////////
-
-    template <class T, class H>
-    typename H::template Rebind<T>::Result &
-    Field(H& obj)
-    {
-        return obj;
-    }
-     
-    template <class T, class H>
-    typename H::template Rebind<T>::Result const &
-    Field(H const & obj)
-    {
-        return obj;
-    }
-
-////////////////////////////////////////////////////////////////////////////////
-// function template TupleUnit
-// The building block of tuples 
-////////////////////////////////////////////////////////////////////////////////
-
-    template <class T>
-    struct TupleUnit
-    {
-        T value_;
-        operator T&() { return value_; }
-        operator const T&() const { return value_; }
-    };
-
-////////////////////////////////////////////////////////////////////////////////
-// class template Tuple
-// Implements a tuple class that holds a number of values and provides field 
-//     access to them via the Field function (below) 
-////////////////////////////////////////////////////////////////////////////////
-
-    template <class TList>
-    struct Tuple : public GenScatterHierarchy<TList, TupleUnit>
-    {
-    };
-
-
-////////////////////////////////////////////////////////////////////////////////
-// helper class template FieldHelper
-// See Field below
-////////////////////////////////////////////////////////////////////////////////
-    
-    template <unsigned int i>
-    struct FieldHelper
-    {            
-        template<class H>
-        struct In
-        {
-        private:
-            typedef typename TL::TypeAt<typename H::TList, i>::Result ElementType;
-            typedef typename H::template Rebind<ElementType>::Result UnitType;
-            
-            enum { isConst = TypeTraits<H>::isConst };
-
-            typedef typename Select
-            <
-                isConst,
-                const typename H::RightBase,
-                typename H::RightBase
-            > 
-            ::Result RightBase;
-
-            typedef typename Select
-            <
-                IsSameType<UnitType, TupleUnit<ElementType> >::value, 
-                ElementType, 
-                UnitType
-            >
-            ::Result UnqualifiedResultType;
-
-        public:
-            typedef typename Select
-            <
-                isConst,
-                const UnqualifiedResultType,
-                UnqualifiedResultType
-            >
-            ::Result ResultType;
-            
-            static ResultType& Do(H& obj)
-            {
-                RightBase& rightBase = obj;
-                return FieldHelper<i - 1>::template In<RightBase>::Do(rightBase);
-            }
-        };
-    };
-
-    template <>
-    struct FieldHelper<0>
-    {            
-        template<class H>
-        struct In
-        {
-        private:
-            typedef typename H::TList::Head ElementType;
-            typedef typename H::template Rebind<ElementType>::Result UnitType;
-            
-            enum { isConst = TypeTraits<H>::isConst };
-
-            typedef typename Select
-            <
-                isConst,
-                const typename H::LeftBase,
-                typename H::LeftBase
-            > 
-            ::Result LeftBase;
-
-            typedef typename Select
-            <
-                IsSameType<UnitType, TupleUnit<ElementType> >::value, 
-                ElementType, 
-                UnitType
-            >
-            ::Result UnqualifiedResultType;
-
-        public:
-            typedef typename Select
-            <
-                isConst,
-                const UnqualifiedResultType,
-                UnqualifiedResultType
-            >
-            ::Result ResultType;
-            
-            static ResultType& Do(H& obj)
-            {
-                LeftBase& leftBase = obj;
-                return leftBase;
-            }
-        };
-    };
-
-////////////////////////////////////////////////////////////////////////////////
-// function template Field
-// Accesses a field in an object of a type generated with GenScatterHierarchy
-// Invocation (obj is an object of a type H generated with GenScatterHierarchy,
-//     i is the index of a type in the typelist used to generate H):
-// Field<i>(obj)
-// returns a reference to Unit<T>, where Unit is the template used to generate H
-//     and T is the i-th type in the typelist 
-////////////////////////////////////////////////////////////////////////////////
-
-    template <unsigned int i, class H>
-    typename FieldHelper<i>::template In<H>::ResultType&
-    Field(H& obj)
-    {
-        return FieldHelper<i>::template In<H>::Do(obj);
-    }
-                
 ////////////////////////////////////////////////////////////////////////////////
 // class template GenLinearHierarchy
 // Generates a linear hierarchy starting from a typelist and a template
@@ -332,80 +39,18 @@ namespace Loki
 // GenLinearHierarchy<TList, Model, Root>
 ////////////////////////////////////////////////////////////////////////////////
     
-    template
-    <
-        class TList,
-        template <class AtomicType, class UnitBase> class Unit,
-        class Root = EmptyType
-    >
-    class GenLinearHierarchy;
-
-    namespace Private
-    {
-    
-    template <typename TListTag> 
-    struct GenLinearHierarchyHelper
-    {
-        template<class TList, template <class, class> class Unit, class Root>
-        struct In 
-        {
-            typedef typename TList::ERROR_THIS_INSTANCE_SELECTED Result; 
-        };
-    };
-    
-    template <> 
-    struct GenLinearHierarchyHelper<TL::Typelist_tag>
-    {
-        template<class TList, template <class, class> class Unit, class Root>
-        struct In 
-        {
-        private:
-            typedef typename TList::Head Head;
-            typedef typename TList::Tail Tail;
+    template <typename, template <typename, typename> typename, typename Root = EmptyType>
+    struct GenLinearHierarchy;
 
-        public:
-            typedef Unit< Head, GenLinearHierarchy<Tail, Unit, Root> > Result; 
-        };
-    };
+    template <typename T, template <typename, typename> typename Unit, typename Root>
+    struct GenLinearHierarchy<Typelist<T>, Unit, Root>
+        : Unit<T, Root>
+    { };
 
-    template <> 
-    struct GenLinearHierarchyHelper<TL::NullType_tag>
-    {
-        template<class TList, template <class, class> class Unit, class Root>
-        struct In
-        {
-        private:
-            typedef typename TList::Head Head;
-
-        public:
-            typedef Unit<Head, Root> Result;
-        };
-    };
-
-    } // namespace Private
-
-    template
-    <
-        class TList,
-        template <class AtomicType, class UnitBase> class Unit,
-        class Root
-    >
-    class GenLinearHierarchy
-        : public Private::GenLinearHierarchyHelper
-          <
-            typename TL::is_Typelist<typename TList::Tail>::type_tag
-          >
-          ::template In<TList, Unit, Root>::Result
-    {
-        ASSERT_TYPELIST(TList); // TList must not be NullType
-
-    public:
-        typedef typename Private::GenLinearHierarchyHelper
-        <
-            typename TL::is_Typelist<typename TList::Tail>::type_tag
-        >
-        ::template In<TList, Unit, Root>::Result LinBase;
-    };
+    template <typename T, typename... Ts, template <typename, typename> typename Unit, typename Root>
+    struct GenLinearHierarchy<Typelist<T, Ts...>, Unit, Root>
+        : Unit<T, GenLinearHierarchy<Typelist<Ts...>, Unit, Root>>
+    { };
 
 }   // namespace Loki
 
@@ -417,7 +62,3 @@ namespace Loki
 
 #endif // HIERARCHYGENERATORS_INC_
 
-#ifdef _MSC_VER
-#pragma warning( pop )
-#endif // _MSC_VER
-
diff --git a/sdk/include/loki/Typelist.h b/sdk/include/loki/Typelist.h
index d314860867d..04de2072891 100644
--- a/sdk/include/loki/Typelist.h
+++ b/sdk/include/loki/Typelist.h
@@ -20,8 +20,7 @@
 #define TYPELIST_INC_
 
 #include <type_traits>
-
-struct None {};
+#include "EmptyType.h"
 
 namespace Loki
 {
diff --git a/src/xrGame/alife_registry_container.h b/src/xrGame/alife_registry_container.h
index d67b71a9999..a77947ba9ad 100644
--- a/src/xrGame/alife_registry_container.h
+++ b/src/xrGame/alife_registry_container.h
@@ -17,7 +17,7 @@ struct CLinearRegistryType : public _base, public _type
 {
 };
 
-class CALifeRegistryContainer : public Loki::GenLinearHierarchy<registry_type_list, CLinearRegistryType>::LinBase
+class CALifeRegistryContainer : public Loki::GenLinearHierarchy<registry_type_list, CLinearRegistryType>
 {
 private:
     typedef registry_type_list TYPE_LIST;
diff --git a/src/xrGame/base_client_classes_wrappers.h b/src/xrGame/base_client_classes_wrappers.h
index 249b89d98f5..dd99c16daa6 100644
--- a/src/xrGame/base_client_classes_wrappers.h
+++ b/src/xrGame/base_client_classes_wrappers.h
@@ -36,7 +36,7 @@ struct heritage
 
     typedef Loki::Typelist<_1, Loki::Typelist<_2, Loki::NullType>> tl;
     typedef typename Loki::TL::Erase<tl, Loki::EmptyType>::Result pure_tl;
-    typedef typename Loki::GenLinearHierarchy<pure_tl, linear_registrator>::LinBase result;
+    typedef typename Loki::GenLinearHierarchy<pure_tl, linear_registrator> result;
 };
 
 template <typename base>