diff --git a/data/classificator.txt b/data/classificator.txt
index 2587a0f057..1cdc518d4a 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -83,10 +83,7 @@ world  +
         post_office  -
         pub  -
         recycling  -
-        restaurant  +
-            vegan  -
-            vegetarian  -
-            {}
+        restaurant  -
         school  -
         shelter  -
         speed_trap  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a83bdfbb19..b3125ceca9 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index c8dea1541b..947e61369f 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -5599,164 +5599,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-restaurant-vegan"
-  element {
-    scale: 13
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-}
-cont {
-  name: "amenity-restaurant-vegetarian"
-  element {
-    scale: 13
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-}
 cont {
   name: "amenity-school"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index f368b44e99..5c3c156065 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index b7d9932b0a..aa3e0c2841 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -6444,230 +6444,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-restaurant-vegan"
-  element {
-    scale: 13
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-}
-cont {
-  name: "amenity-restaurant-vegetarian"
-  element {
-    scale: 13
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-}
 cont {
   name: "amenity-school"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index f506e74190..d0a6e0ce9e 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 1b2c1e0959..e9a3b7a13a 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -6444,230 +6444,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-restaurant-vegan"
-  element {
-    scale: 13
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-}
-cont {
-  name: "amenity-restaurant-vegetarian"
-  element {
-    scale: 13
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "restaurant-s"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 6
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 20
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant-m"
-      priority: 16864
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
-    }
-  }
-}
 cont {
   name: "amenity-school"
   element {
diff --git a/data/drules_proto_legacy.bin b/data/drules_proto_legacy.bin
index b91dc4dc51..f5e9f9e3ad 100644
Binary files a/data/drules_proto_legacy.bin and b/data/drules_proto_legacy.bin differ
diff --git a/data/drules_proto_legacy.txt b/data/drules_proto_legacy.txt
index a2ccc0c168..56d84b3f0c 100644
--- a/data/drules_proto_legacy.txt
+++ b/data/drules_proto_legacy.txt
@@ -4860,122 +4860,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-restaurant-vegan"
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-}
-cont {
-  name: "amenity-restaurant-vegetarian"
-  element {
-    scale: 16
-    symbol {
-      name: "restaurant"
-      priority: 16000
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "restaurant"
-      priority: 16003
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4210752
-        stroke_color: 16777215
-        offset_y: 10
-      }
-      priority: 15003
-    }
-  }
-}
 cont {
   name: "amenity-school"
   element {
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 8ace908a13..d8fff0cd21 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -368,7 +368,7 @@ railway|narrow_gauge|bridge;[railway=narrow_gauge][bridge?];;name;int_name;367;
 noexit|motorcar;[noexit=motorcar];x;name;int_name;368;
 highway|service|parking_aisle|tunnel;[highway=service][service=parking_aisle][tunnel?];x;name;int_name;369;highway|service|parking_aisle
 highway|bridleway|permissive;[highway=bridleway][access=permissive];;name;int_name;370;
-railway|construction;[railway=construction];name;int_name;371;
+railway|construction;[railway=construction];;name;int_name;371;
 highway|primary_link|junction;[highway=primary_link][junction?];x;name;int_name;372;highway|primary_link
 landuse|greenhouse_horticulture;[landuse=greenhouse_horticulture];;name;int_name;373;
 highway|primary_link|motorroad;[highway=primary_link][motorroad?];x;name;int_name;374;highway|primary_link
@@ -461,7 +461,6 @@ railway|construction|tunnel;[railway][construction?][tunnel?];x;name;int_name;46
 sport|handball;[sport=handball];;name;int_name;461;
 boundary|administrative|city;[boundary=administrative][border_type=city];;name;int_name;462;
 piste:type|downhill|freeride;[piste:type=downhill][piste:difficulty=freeride];;name;int_name;463;
-amenity|restaurant|vegetarian;[amenity=restaurant][cuisine=vegetarian];;name;int_name;464;
 communication|line|submarine;[communication=line][location=submarine];x;name;int_name;465;communication|line
 piste:type|downhill|expert;[piste:type=downhill][piste:difficulty=expert];;name;int_name;466;
 landuse|salt_pond;[landuse=salt_pond];;name;int_name;467;
@@ -543,7 +542,6 @@ amenity|speed_trap;[amenity=speed_trap];;name;int_name;542;
 highway|track|grade4|area;[highway=track][tracktype=grade4][area?];x;name;int_name;543;area:highway|track
 highway|primary|area;[highway=primary][area?];x;name;int_name;544;area:highway|primary
 power|line|underground;[power=line][location=underground];;name;int_name;545;
-amenity|restaurant|vegan;[amenity=restaurant][cuisine=vegan];;name;int_name;546;
 highway|track|construction;[highway=track][construction?];x;name;int_name;547;highway|construction
 highway|minor|oneway;[highway=minor][oneway?];x;name;int_name;548;highway|unclassified
 highway|bridleway|cutting;[highway=bridleway][cutting?];x;name;int_name;549;highway|bridleway
@@ -956,7 +954,7 @@ shop|furniture;[shop=furniture];;name;int_name;955;
 natural|grassland;[natural=grassland];;name;int_name;956;
 natural|waterfall;[natural=waterfall];;name;int_name;957;
 waterway|waterfall;[waterway=waterfall];;name;int_name;958;
-railway|proposed;[railway=proposed];name;int_name;959;
+railway|proposed;[railway=proposed];;name;int_name;959;
 amenity|casino;[amenity=casino];;name;int_name;960;
 amenity|brothel;[amenity=brothel];;name;int_name;961;
 place|neighbourhood;[place=neighbourhood];;name;int_name;962;
diff --git a/data/types.txt b/data/types.txt
index c64c77e686..50c0032903 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -461,7 +461,7 @@ mapswithme
 sport|handball
 boundary|administrative|city
 piste:type|downhill|freeride
-amenity|restaurant|vegetarian
+mapswithme
 communication|line
 piste:type|downhill|expert
 landuse|salt_pond
@@ -543,7 +543,7 @@ amenity|speed_trap
 area:highway|track
 area:highway|primary
 power|line|underground
-amenity|restaurant|vegan
+mapswithme
 highway|construction
 highway|unclassified
 highway|bridleway
diff --git a/data/visibility.txt b/data/visibility.txt
index 9ce385e354..c5dc178cdd 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -83,10 +83,7 @@ world  00000000000000000000  +
         post_office  00000000000000001111  -
         pub  00000000000000001111  -
         recycling  00000000000000000111  -
-        restaurant  00000000000000001111  +
-            vegan  00000000000000001111  -
-            vegetarian  00000000000000001111  -
-            {}
+        restaurant  00000000000000001111  -
         school  00000000000001111111  -
         shelter  00000000000000111111  -
         speed_trap  00000000000000001111  -