diff --git a/src/xrAICore/Navigation/data_storage_constructor.h b/src/xrAICore/Navigation/data_storage_constructor.h
index a9713d0c1a7..39ad160e0b6 100644
--- a/src/xrAICore/Navigation/data_storage_constructor.h
+++ b/src/xrAICore/Navigation/data_storage_constructor.h
@@ -18,14 +18,13 @@ template <
 >
 struct CManagerBuilderAllocatorConstructor {
 	template <
-		template <typename T> class _vertex = CEmptyClassTemplate,
-		template <typename T1, typename T2> class _index_vertex = CEmptyClassTemplate2
+		template <typename T> class _vertex = CEmptyClassTemplate
 	>
 	class CDataStorage : 
-	    public _manager::template CDataStorage<_builder, _allocator, _vertex, _index_vertex>
+	    public _manager::template CDataStorage<_builder, _allocator, _vertex>
 	{
 	public:
-	    typedef typename _manager::template CDataStorage<_builder, _allocator, _vertex, _index_vertex> inherited;
+	    typedef typename _manager::template CDataStorage<_builder, _allocator, _vertex> inherited;
 		typedef typename inherited::CDataStorageAllocator inherited_allocator;
 		typedef typename inherited::CGraphVertex	CGraphVertex;
 		typedef typename CGraphVertex::_index_type	_index_type;
diff --git a/src/xrAICore/Navigation/vertex_manager_fixed.h b/src/xrAICore/Navigation/vertex_manager_fixed.h
index 01576f31a88..5c1075b00be 100644
--- a/src/xrAICore/Navigation/vertex_manager_fixed.h
+++ b/src/xrAICore/Navigation/vertex_manager_fixed.h
@@ -38,8 +38,7 @@ struct CVertexManagerFixed {
 	template <
         typename _builder,
         typename _allocator,
-		template <typename _T> class _vertex = CEmptyClassTemplate,
-		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2
+		template <typename _T> class _vertex = CEmptyClassTemplate
 	> 
     class CDataStorage :
         public _builder::template CDataStorage<VertexManager<_vertex>::_vertex>,
@@ -51,11 +50,11 @@ struct CVertexManagerFixed {
             typename _builder::template CDataStorage<VertexManager<_vertex>::_vertex>::CGraphVertex> CDataStorageAllocator;
 		typedef typename CDataStorageBase::CGraphVertex CGraphVertex;
 		typedef typename CGraphVertex::_index_type _index_type;
-        //using inherited = CDataStorageAllocator;
 
 #pragma pack(push,1)
 		template <typename _path_id_type>
-		struct SGraphIndexVertex : public _index_vertex<CGraphVertex,SGraphIndexVertex<_path_id_type> > {
+		struct SGraphIndexVertex
+        {
 			_path_id_type	m_path_id;
 			CGraphVertex	*m_vertex;
 		};
diff --git a/src/xrAICore/Navigation/vertex_manager_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_fixed_inline.h
index 1d34c502f52..c09cb73af0e 100644
--- a/src/xrAICore/Navigation/vertex_manager_fixed_inline.h
+++ b/src/xrAICore/Navigation/vertex_manager_fixed_inline.h
@@ -17,11 +17,10 @@
 	template <\
 		typename _builder,\
         typename _allocator,\
-		template <typename _T> class _vertex,\
-		template <typename _T1, typename _T2> class _index_vertex\
+		template <typename _T> class _vertex\
 	>
 
-#define CFixedVertexManager	CVertexManagerFixed<_path_id_type,_index_type,mask>::CDataStorage<_builder,_allocator,_vertex,_index_vertex>
+#define CFixedVertexManager	CVertexManagerFixed<_path_id_type,_index_type,mask>::CDataStorage<_builder,_allocator,_vertex>
 
 TEMPLATE_SPECIALIZATION
 IC	CFixedVertexManager::CDataStorage		(const u32 vertex_count) :
diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed.h
index 8a85228ac79..8a09fe9f056 100644
--- a/src/xrAICore/Navigation/vertex_manager_hash_fixed.h
+++ b/src/xrAICore/Navigation/vertex_manager_hash_fixed.h
@@ -49,8 +49,7 @@ struct CVertexManagerHashFixed {
 	template <
         typename _builder,
         typename _allocator,
-		template <typename _T> class _vertex = CEmptyClassTemplate,
-		template <typename _T1, typename _T2> class _index_vertex = CEmptyClassTemplate2
+		template <typename _T> class _vertex = CEmptyClassTemplate
 	> 
     class CDataStorage :
         public _builder::template CDataStorage<VertexManager<_vertex>::_vertex>,
@@ -65,7 +64,8 @@ struct CVertexManagerHashFixed {
 
 #pragma pack(push,1)
 		template <typename _path_id_type>
-		struct SGraphIndexVertex : public _index_vertex<CGraphVertex,SGraphIndexVertex<_path_id_type> > {
+		struct SGraphIndexVertex
+        {
 			CGraphVertex		*m_vertex;
 			SGraphIndexVertex	*m_next;
 			SGraphIndexVertex	*m_prev;
diff --git a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
index af22669f026..2986f23ef74 100644
--- a/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
+++ b/src/xrAICore/Navigation/vertex_manager_hash_fixed_inline.h
@@ -18,11 +18,10 @@
 	template <\
 		typename _builder,\
         typename _allocator,\
-		template <typename _T> class _vertex,\
-		template <typename _T1, typename _T2> class _index_vertex\
+		template <typename _T> class _vertex\
 	>
 
-#define CHashFixedVertexManager	CVertexManagerHashFixed<_path_id_type,_index_type,hash_size,fix_size>::CDataStorage<_builder,_allocator,_vertex,_index_vertex>
+#define CHashFixedVertexManager	CVertexManagerHashFixed<_path_id_type,_index_type,hash_size,fix_size>::CDataStorage<_builder,_allocator,_vertex>
 
 TEMPLATE_SPECIALIZATION
 IC	CHashFixedVertexManager::CDataStorage		(const u32 vertex_count) :