diff --git a/generator/generator_tests/osm_type_test.cpp b/generator/generator_tests/osm_type_test.cpp
index 527f4ccdea..4f478ab85b 100644
--- a/generator/generator_tests/osm_type_test.cpp
+++ b/generator/generator_tests/osm_type_test.cpp
@@ -1848,6 +1848,7 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_SimpleTypesSmoke)
     {"historic", "archaeological_site"},
     {"historic", "boundary_stone"},
     {"historic", "castle"},
+    {"historic", "city_gate"},
     {"historic", "citywalls"},
     {"historic", "fort"},
     {"historic", "memorial"},
@@ -2317,6 +2318,10 @@ UNIT_CLASS_TEST(TestWithClassificator, OsmType_ComplexTypesSmoke)
     {{"highway", "unclassified", "bridge"}, {{"highway", "unclassified"}, {"bridge", "any_value"}}},
     {{"highway", "unclassified", "tunnel"}, {{"highway", "unclassified"}, {"tunnel", "any_value"}}},
     {{"historic", "castle", "defensive"}, {{"historic", "castle"}, {"castle_type", "defensive"}}},
+    {{"historic", "castle", "fortress"}, {{"historic", "castle"}, {"castle_type", "fortress"}}},
+    {{"historic", "castle", "fortress"}, {{"historic", "fortress"}}},
+    {{"historic", "castle", "manor"}, {{"historic", "castle"}, {"castle_type", "manor"}}},
+    {{"historic", "castle", "manor"}, {{"historic", "manor"}}},
     {{"historic", "castle", "stately"}, {{"historic", "castle"}, {"castle_type", "stately"}}},
     {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial", "plaque"}}},
     {{"historic", "memorial", "plaque"}, {{"historic", "memorial"}, {"memorial:type", "plaque"}}},
diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp
index 55b596d8ef..a1984175ed 100644
--- a/generator/osm2type.cpp
+++ b/generator/osm2type.cpp
@@ -588,21 +588,6 @@ void PreprocessElement(OsmElement * p)
     }
   });
 
-  p->UpdateTag("castle_type", [](string & value) {
-    if (value.empty())
-      return;
-
-    if (value == "fortress" || value == "kremlin" || value == "castrum" || value == "shiro" ||
-        value == "citadel")
-    {
-      value = "defensive";
-    }
-    else if (value == "manor" || value == "palace")
-    {
-      value = "stately";
-    }
-  });
-
   p->UpdateTag("attraction", [](string & value) {
     // "specified" is a special value which means we have the "attraction" tag,
     // but its value is not "animal".