diff --git a/indexer/feature_visibility.cpp b/indexer/feature_visibility.cpp
index 0ecaeeb698..8018efc3d7 100644
--- a/indexer/feature_visibility.cpp
+++ b/indexer/feature_visibility.cpp
@@ -12,9 +12,7 @@ namespace
 {
   bool NeedProcessParent(ClassifObject const * p)
   {
-    string const & n = p->GetName();
-    // same as is_mark_key (@see osm2type.cpp)
-    return (n == "bridge" || n == "junction" || n == "oneway" || n == "fee");
+    return false;
   }
 }
 
@@ -38,7 +36,6 @@ Classificator::ProcessObjects(uint32_t type, ToDo & toDo) const
     path[i++] = p;
     toDo(p);
   }
-
   if (path.empty())
     return res;
   else
diff --git a/indexer/types_mapping.cpp b/indexer/types_mapping.cpp
index 5b1c36f0e4..12e538d3a1 100644
--- a/indexer/types_mapping.cpp
+++ b/indexer/types_mapping.cpp
@@ -33,11 +33,7 @@ void IndexAndTypeMapping::Add(uint32_t ind, uint32_t type)
   ASSERT_EQUAL ( ind, m_types.size(), () );
   m_types.push_back(type);
 
-  if (!m_map.insert(make_pair(type, ind)).second)
-  {
-    string const name = classif().GetFullObjectName(type);
-    CHECK_EQUAL(name, "mapswithme|", ());
-  }
+  m_map.insert(make_pair(type, ind));
 }
 
 uint32_t IndexAndTypeMapping::GetIndex(uint32_t t) const