diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml
index 4c7ee0214..ada7eaeab 100644
--- a/android/sdk/src/main/res/values/types_strings.xml
+++ b/android/sdk/src/main/res/values/types_strings.xml
@@ -274,7 +274,6 @@
     <string name="type.craft.shoemaker">Shoe Repair</string>
     <string name="type.craft.winery">Winery</string>
     <string name="type.craft.tailor">Tailor</string>
-    <string name="type.cuisine.afghan">Afghan</string>
     <string name="type.cuisine.african">African</string>
     <string name="type.cuisine.american">American</string>
     <string name="type.cuisine.arab">Arab</string>
@@ -283,62 +282,38 @@
     <string name="type.cuisine.austrian">Austrian</string>
     <string name="type.cuisine.bagel">Bagel</string>
     <string name="type.cuisine.balkan">Balkan</string>
-    <string name="type.cuisine.bar_and_grill">Bar and Grill</string>
     <string name="type.cuisine.barbecue">Barbecue</string>
     <string name="type.cuisine.bavarian">Bavarian</string>
     <string name="type.cuisine.beef_bowl">Beef Bowl</string>
-    <string name="type.cuisine.bistro">Bistro</string>
-    <string name="type.cuisine.bolivian">Bolivian</string>
     <string name="type.cuisine.brazilian">Brazilian</string>
     <string name="type.cuisine.breakfast">Breakfast</string>
-    <string name="type.cuisine.british">British</string>
-    <string name="type.cuisine.brunch">Brunch</string>
     <string name="type.cuisine.bubble_tea">Bubble Tea</string>
-    <string name="type.cuisine.buffet">Buffet</string>
     <string name="type.cuisine.burger">Burger</string>
     <string name="type.cuisine.buschenschank">Buschenschank</string>
-    <string name="type.cuisine.cajun">Cajun</string>
     <string name="type.cuisine.cake">Cake</string>
-    <string name="type.cuisine.cantonese">Cantonese</string>
     <string name="type.cuisine.caribbean">Caribbean</string>
     <string name="type.cuisine.chicken">Chicken</string>
     <string name="type.cuisine.chinese">Chinese</string>
-    <string name="type.cuisine.churro">Churro</string>
     <string name="type.cuisine.coffee_shop">Coffee</string>
-    <string name="type.cuisine.colombian">Colombian</string>
     <string name="type.cuisine.crepe">Crepe</string>
     <string name="type.cuisine.croatian">Croatian</string>
-    <string name="type.cuisine.cuban">Cuban</string>
     <string name="type.cuisine.curry">Curry</string>
-    <string name="type.cuisine.czech">Czech</string>
-    <string name="type.cuisine.danish">Danish</string>
     <string name="type.cuisine.deli">Deli</string>
-    <string name="type.cuisine.dessert">Dessert</string>
     <string name="type.cuisine.diner">Diner</string>
     <string name="type.cuisine.donut">Donut</string>
-    <string name="type.cuisine.dumplings">Dumplings</string>
-    <string name="type.cuisine.empanada">Empanada</string>
     <string name="type.cuisine.ethiopian">Ethiopian</string>
-    <string name="type.cuisine.european">European</string>
-    <string name="type.cuisine.falafel">Falafel</string>
     <string name="type.cuisine.filipino">Filipino</string>
     <string name="type.cuisine.fine_dining">Fine Dining</string>
     <string name="type.cuisine.fish">Fish</string>
     <string name="type.cuisine.fish_and_chips">Fish and Chips</string>
     <string name="type.cuisine.french">French</string>
-    <string name="type.cuisine.french_fries">French Fries</string>
-    <string name="type.cuisine.french_tacos">French Tacos</string>
-    <string name="type.cuisine.fried_food">Fried Food</string>
     <string name="type.cuisine.friture">Friture</string>
-    <string name="type.cuisine.frozen_yogurt">Frozen Yogurt</string>
     <string name="type.cuisine.georgian">Georgian</string>
     <string name="type.cuisine.german">German</string>
     <string name="type.cuisine.greek">Greek</string>
     <string name="type.cuisine.grill">Grill</string>
-    <string name="type.cuisine.hawaiian">Hawaiian</string>
     <string name="type.cuisine.heuriger">Heuriger</string>
     <string name="type.cuisine.hotdog">Hotdog</string>
-    <string name="type.cuisine.hotpot">Hotpot</string>
     <string name="type.cuisine.hungarian">Hungarian</string>
     <string name="type.cuisine.ice_cream">Ice Cream</string>
     <string name="type.cuisine.indian">Indian</string>
@@ -347,76 +322,44 @@
     <string name="type.cuisine.irish">Irish</string>
     <string name="type.cuisine.italian">Italian</string>
     <string name="type.cuisine.italian_pizza">Italian, Pizza</string>
-    <string name="type.cuisine.jamaican">Jamaican</string>
     <string name="type.cuisine.japanese">Japanese</string>
-    <string name="type.cuisine.juice">Juice</string>
     <string name="type.cuisine.kebab">Kebab</string>
     <string name="type.cuisine.korean">Korean</string>
     <string name="type.cuisine.lao">Lao</string>
-    <string name="type.cuisine.latin_american">Latin American</string>
     <string name="type.cuisine.lebanese">Lebanese</string>
     <string name="type.cuisine.local">Local</string>
     <string name="type.cuisine.malagasy">Malagasy</string>
     <string name="type.cuisine.malaysian">Malaysian</string>
-    <string name="type.cuisine.meat">Meat</string>
     <string name="type.cuisine.mediterranean">Mediterranean</string>
     <string name="type.cuisine.mexican">Mexican</string>
-    <string name="type.cuisine.middle_eastern">Middle Eastern</string>
-    <string name="type.cuisine.mongolian_grill">Mongolian Grill</string>
     <string name="type.cuisine.moroccan">Moroccan</string>
-    <string name="type.cuisine.nepalese">Nepalese</string>
     <string name="type.cuisine.noodles">Noodles</string>
     <string name="type.cuisine.oriental">East Asian</string>
-    <string name="type.cuisine.pakistani">Pakistani</string>
     <string name="type.cuisine.pancake">Pancake</string>
     <string name="type.cuisine.pasta">Pasta</string>
     <string name="type.cuisine.persian">Persian</string>
     <string name="type.cuisine.peruvian">Peruvian</string>
-    <string name="type.cuisine.piadina">Piadina</string>
-    <string name="type.cuisine.pie_and_mash">Pie and Mash</string>
     <string name="type.cuisine.pizza">Pizza</string>
-    <string name="type.cuisine.poke">Poke</string>
     <string name="type.cuisine.polish">Polish</string>
     <string name="type.cuisine.portuguese">Portuguese</string>
-    <string name="type.cuisine.potato">Potato</string>
-    <string name="type.cuisine.pretzel">Pretzel</string>
     <string name="type.cuisine.ramen">Ramen</string>
     <string name="type.cuisine.regional">Regional</string>
-    <string name="type.cuisine.rice_noodle">Rice Noodle</string>
     <string name="type.cuisine.russian">Russian</string>
     <string name="type.cuisine.sandwich">Sandwich</string>
     <string name="type.cuisine.sausage">Sausage</string>
     <string name="type.cuisine.savory_pancakes">Savory Pancakes</string>
     <string name="type.cuisine.seafood">Seafood</string>
-    <string name="type.cuisine.shawarma">Shawarma</string>
-    <string name="type.cuisine.snack">Snack</string>
     <string name="type.cuisine.soba">Soba</string>
-    <string name="type.cuisine.soup">Soup</string>
-    <string name="type.cuisine.southern">Southern</string>
     <string name="type.cuisine.spanish">Spanish</string>
     <string name="type.cuisine.steak_house">Steak House</string>
     <string name="type.cuisine.sushi">Sushi</string>
-    <string name="type.cuisine.swedish">Swedish</string>
-    <string name="type.cuisine.syrian">Syrian</string>
-    <string name="type.cuisine.tacos">Tacos</string>
-    <string name="type.cuisine.taiwanese">Taiwanese</string>
-    <string name="type.cuisine.takoyaki">Takoyaki</string>
     <string name="type.cuisine.tapas">Tapas</string>
     <string name="type.cuisine.tea">Tea</string>
-    <string name="type.cuisine.teppanyaki">Teppanyaki</string>
     <string name="type.cuisine.thai">Thai</string>
     <string name="type.cuisine.turkish">Turkish</string>
-    <string name="type.cuisine.ukrainian">Ukrainian</string>
-    <string name="type.cuisine.uzbek">Uzbek</string>
     <string name="type.cuisine.vegan">Vegan</string>
     <string name="type.cuisine.vegetarian">Vegetarian</string>
-    <string name="type.cuisine.venezuelan">Venezuelan</string>
     <string name="type.cuisine.vietnamese">Vietnamese</string>
-    <string name="type.cuisine.waffle">Waffle</string>
-    <string name="type.cuisine.western">Western</string>
-    <string name="type.cuisine.wings">Wings</string>
-    <string name="type.cuisine.yakiniku">Yakiniku</string>
-    <string name="type.cuisine.yakitori">Yakitori</string>
     <string name="type.emergency">Emergency</string>
     <string name="type.emergency.assembly_point">Emergency Assembly Point</string>
     <string name="type.emergency.defibrillator">Defibrillator</string>
diff --git a/data/categories_cuisines.txt b/data/categories_cuisines.txt
index c6fe088f6..3d69edd75 100644
--- a/data/categories_cuisines.txt
+++ b/data/categories_cuisines.txt
@@ -2931,174 +2931,3 @@ sr:Веганска|Вегетаријанска|Вегетаријанци|Ве
 # el:Βιετναμέζικη κουζίνα
 # he:מטבח וייטנאמי
 # sk:Vietnamská kuchyňa
-
-cuisine-juice
-en:Juice
-
-cuisine-wings
-en:Wings
-
-# cuisine-dessert
-# en:Dessert
-
-cuisine-frozen_yogurt
-en:Frozen Yogurt
-
-cuisine-tacos
-en:Tacos
-
-cuisine-dumplings
-en:Dumplings
-
-# cuisine-taiwanese
-# en:Taiwanese cuisine
-
-# cuisine-british
-# en:British cuisine
-
-# cuisine-middle_eastern
-# en:Middle Eastern cuisine
-
-cuisine-shawarma
-en:Shawarma
-
-cuisine-pretzel
-en:Pretzel
-
-# cuisine-bistro
-# en:Bistro
-
-cuisine-poke
-en:Poke
-
-cuisine-hotpot
-en:Hotpot
-
-# cuisine-latin_american
-# en:Latin American cuisine
-
-# cuisine-hawaiian
-# en:Hawaiian cuisine
-
-cuisine-churro
-en:Churro
-
-# cuisine-western
-# en:Western cuisine
-
-cuisine-french_fries
-en:French Fries
-
-cuisine-fried_food
-en:Fried Food
-
-cuisine-empanada
-en:Empanada
-
-cuisine-piadina
-en:Piadina
-
-# cuisine-buffet
-# en:Buffet
-
-# cuisine-european
-# en:European cuisine
-
-# cuisine-bar_and_grill
-# en:Bar and Grill
-
-# cuisine-jamaican
-# en:Jamaican cuisine
-
-cuisine-waffle
-en:Waffle
-
-# cuisine-potato
-# en:Potato
-
-# cuisine-meat
-# en:Meat
-
-# cuisine-nepalese
-# en:Nepalese cuisine
-
-cuisine-brunch
-en:Brunch
-
-# cuisine-ukrainian
-# en:Ukrainian cuisine
-
-# cuisine-cuban
-# en:Cuban cuisine
-
-# cuisine-uzbek
-# en:Uzbek cuisine
-
-# cuisine-bolivian
-# en:Bolivian cuisine
-
-cuisine-yakiniku
-en:Yakiniku
-
-# cuisine-afghan
-# en:Afghan cuisine
-
-# cuisine-syrian
-# en:Syrian cuisine
-
-# cuisine-cantonese
-# en:Cantonese cuisine
-
-cuisine-french_tacos
-en:French Tacos
-
-# cuisine-snack
-# en:Snack
-
-# cuisine-danish
-# en:Danish cuisine
-
-cuisine-soup
-en:Soup
-
-# cuisine-swedish
-# en:Swedish cuisine
-
-cuisine-falafel
-en:Falafel
-
-cuisine-rice_noodle
-en:Rice Noodle
-
-# cuisine-czech
-# en:Czech cuisine
-
-cuisine-teppanyaki
-en:Teppanyaki
-
-# cuisine-pakistani
-# en:Pakistani cuisine
-
-# cuisine-colombian
-# en:Colombian cuisine
-
-# cuisine-cajun
-# en:Cajun cuisine
-
-cuisine-takoyaki
-en:Takoyaki
-
-# cuisine-mongolian_grill
-# en:Mongolian Grill
-
-cuisine-yakitori
-en:Yakitori
-
-# cuisine-southern
-# en:Southern cuisine
-
-cuisine-pie_and_mash
-en:Pie and Mash
-
-# cuisine-venezuelan
-# en:Venezuelan cuisine
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 142c0066b..8bf702368 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1447,7 +1447,7 @@ cuisine|savory_pancakes;1318;
 cuisine|moroccan;1319;
 cuisine|peruvian;1320;
 cuisine|fine_dining;1321;
-cuisine|tea;[cuisine=tea],[cuisine=tea_house],[cuisine=tea_room];;;;1322;
+cuisine|tea;1322;
 natural|geyser;1323;
 cuisine|bubble_tea;1324;
 natural|hot_spring;1325;
@@ -1758,60 +1758,3 @@ amenity|luggage_locker;1629;
 building|guardhouse;[building=guardhouse],[amenity=security_booth],[amenity=checkpoint];;;;1630;
 office|security;1631;
 shop|lighting;1632;
-cuisine|afghan;1633;
-cuisine|bar_and_grill;1634;
-cuisine|bistro;1635;
-cuisine|bolivian;1636;
-cuisine|british;1637;
-cuisine|brunch;1638;
-cuisine|buffet;1639;
-cuisine|cajun;1640;
-cuisine|cantonese;1641;
-cuisine|churro;1642;
-cuisine|colombian;1643;
-cuisine|cuban;1644;
-cuisine|czech;1645;
-cuisine|danish;1646;
-cuisine|dessert;1647;
-cuisine|dumplings;1648;
-cuisine|empanada;1649;
-cuisine|european;1650;
-cuisine|falafel;1651;
-cuisine|french_fries;1652;
-cuisine|french_tacos;1653;
-cuisine|fried_food;1654;
-cuisine|frozen_yogurt;1655;
-cuisine|hawaiian;1656;
-cuisine|hotpot;1657;
-cuisine|jamaican;1658;
-cuisine|juice;1659;
-cuisine|latin_american;1660;
-cuisine|meat;1661;
-cuisine|middle_eastern;1662;
-cuisine|mongolian_grill;1663;
-cuisine|nepalese;1664;
-cuisine|pakistani;1667;
-cuisine|piadina;1668;
-cuisine|pie_and_mash;1669;
-cuisine|poke;1670;
-cuisine|potato;1671;
-cuisine|pretzel;1672;
-cuisine|rice_noodle;1673;
-cuisine|shawarma;1674;
-cuisine|snack;1675;
-cuisine|soup;1676;
-cuisine|southern;1677;
-cuisine|swedish;1678;
-cuisine|syrian;1679;
-cuisine|tacos;1680;
-cuisine|taiwanese;1681;
-cuisine|takoyaki;1682;
-cuisine|teppanyaki;1683;
-cuisine|ukrainian;1684;
-cuisine|uzbek;1685;
-cuisine|venezuelan;1686;
-cuisine|waffle;1687;
-cuisine|western;1688;
-cuisine|wings;1689;
-cuisine|yakiniku;1690;
-cuisine|yakitori;1691;
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index ee0e973a0..38f51ccd0 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -289,7 +289,6 @@
 "type.craft.shoemaker" = "Shoe Repair";
 "type.craft.winery" = "Winery";
 "type.craft.tailor" = "Tailor";
-"type.cuisine.afghan" = "Afghan";
 "type.cuisine.african" = "African";
 "type.cuisine.american" = "American";
 "type.cuisine.arab" = "Arab";
@@ -298,62 +297,38 @@
 "type.cuisine.austrian" = "Austrian";
 "type.cuisine.bagel" = "Bagel";
 "type.cuisine.balkan" = "Balkan";
-"type.cuisine.bar_and_grill" = "Bar and Grill";
 "type.cuisine.barbecue" = "Barbecue";
 "type.cuisine.bavarian" = "Bavarian";
 "type.cuisine.beef_bowl" = "Beef Bowl";
-"type.cuisine.bistro" = "Bistro";
-"type.cuisine.bolivian" = "Bolivian";
 "type.cuisine.brazilian" = "Brazilian";
 "type.cuisine.breakfast" = "Breakfast";
-"type.cuisine.british" = "British";
-"type.cuisine.brunch" = "Brunch";
 "type.cuisine.bubble_tea" = "Bubble Tea";
-"type.cuisine.buffet" = "Buffet";
 "type.cuisine.burger" = "Burger";
 "type.cuisine.buschenschank" = "Buschenschank";
-"type.cuisine.cajun" = "Cajun";
 "type.cuisine.cake" = "Cake";
-"type.cuisine.cantonese" = "Cantonese";
 "type.cuisine.caribbean" = "Caribbean";
 "type.cuisine.chicken" = "Chicken";
 "type.cuisine.chinese" = "Chinese";
-"type.cuisine.churro" = "Churro";
 "type.cuisine.coffee_shop" = "Coffee";
-"type.cuisine.colombian" = "Colombian";
 "type.cuisine.crepe" = "Crepe";
 "type.cuisine.croatian" = "Croatian";
-"type.cuisine.cuban" = "Cuban";
 "type.cuisine.curry" = "Curry";
-"type.cuisine.czech" = "Czech";
-"type.cuisine.danish" = "Danish";
 "type.cuisine.deli" = "Deli";
-"type.cuisine.dessert" = "Dessert";
 "type.cuisine.diner" = "Diner";
 "type.cuisine.donut" = "Donut";
-"type.cuisine.dumplings" = "Dumplings";
-"type.cuisine.empanada" = "Empanada";
 "type.cuisine.ethiopian" = "Ethiopian";
-"type.cuisine.european" = "European";
-"type.cuisine.falafel" = "Falafel";
 "type.cuisine.filipino" = "Filipino";
 "type.cuisine.fine_dining" = "Fine Dining";
 "type.cuisine.fish" = "Fish";
 "type.cuisine.fish_and_chips" = "Fish and Chips";
 "type.cuisine.french" = "French";
-"type.cuisine.french_fries" = "French Fries";
-"type.cuisine.french_tacos" = "French Tacos";
-"type.cuisine.fried_food" = "Fried Food";
 "type.cuisine.friture" = "Friture";
-"type.cuisine.frozen_yogurt" = "Frozen Yogurt";
 "type.cuisine.georgian" = "Georgian";
 "type.cuisine.german" = "German";
 "type.cuisine.greek" = "Greek";
 "type.cuisine.grill" = "Grill";
-"type.cuisine.hawaiian" = "Hawaiian";
 "type.cuisine.heuriger" = "Heuriger";
 "type.cuisine.hotdog" = "Hotdog";
-"type.cuisine.hotpot" = "Hotpot";
 "type.cuisine.hungarian" = "Hungarian";
 "type.cuisine.ice_cream" = "Ice Cream";
 "type.cuisine.indian" = "Indian";
@@ -362,76 +337,44 @@
 "type.cuisine.irish" = "Irish";
 "type.cuisine.italian" = "Italian";
 "type.cuisine.italian_pizza" = "Italian, Pizza";
-"type.cuisine.jamaican" = "Jamaican";
 "type.cuisine.japanese" = "Japanese";
-"type.cuisine.juice" = "Juice";
 "type.cuisine.kebab" = "Kebab";
 "type.cuisine.korean" = "Korean";
 "type.cuisine.lao" = "Lao";
-"type.cuisine.latin_american" = "Latin American";
 "type.cuisine.lebanese" = "Lebanese";
 "type.cuisine.local" = "Local";
 "type.cuisine.malagasy" = "Malagasy";
 "type.cuisine.malaysian" = "Malaysian";
-"type.cuisine.meat" = "Meat";
 "type.cuisine.mediterranean" = "Mediterranean";
 "type.cuisine.mexican" = "Mexican";
-"type.cuisine.middle_eastern" = "Middle Eastern";
-"type.cuisine.mongolian_grill" = "Mongolian Grill";
 "type.cuisine.moroccan" = "Moroccan";
-"type.cuisine.nepalese" = "Nepalese";
 "type.cuisine.noodles" = "Noodles";
 "type.cuisine.oriental" = "East Asian";
-"type.cuisine.pakistani" = "Pakistani";
 "type.cuisine.pancake" = "Pancake";
 "type.cuisine.pasta" = "Pasta";
 "type.cuisine.persian" = "Persian";
 "type.cuisine.peruvian" = "Peruvian";
-"type.cuisine.piadina" = "Piadina";
-"type.cuisine.pie_and_mash" = "Pie and Mash";
 "type.cuisine.pizza" = "Pizza";
-"type.cuisine.poke" = "Poke";
 "type.cuisine.polish" = "Polish";
 "type.cuisine.portuguese" = "Portuguese";
-"type.cuisine.potato" = "Potato";
-"type.cuisine.pretzel" = "Pretzel";
 "type.cuisine.ramen" = "Ramen";
 "type.cuisine.regional" = "Regional";
-"type.cuisine.rice_noodle" = "Rice Noodles";
 "type.cuisine.russian" = "Russian";
 "type.cuisine.sandwich" = "Sandwich";
 "type.cuisine.sausage" = "Sausage";
 "type.cuisine.savory_pancakes" = "Savory Pancakes";
 "type.cuisine.seafood" = "Seafood";
-"type.cuisine.shawarma" = "Shawarma";
-"type.cuisine.snack" = "Snack";
 "type.cuisine.soba" = "Soba";
-"type.cuisine.soup" = "Soup";
-"type.cuisine.southern" = "Southern";
 "type.cuisine.spanish" = "Spanish";
 "type.cuisine.steak_house" = "Steak House";
 "type.cuisine.sushi" = "Sushi";
-"type.cuisine.swedish" = "Swedish";
-"type.cuisine.syrian" = "Syrian";
-"type.cuisine.tacos" = "Tacos";
-"type.cuisine.taiwanese" = "Taiwanese";
-"type.cuisine.takoyaki" = "Takoyaki";
 "type.cuisine.tapas" = "Tapas";
 "type.cuisine.tea" = "Tea";
-"type.cuisine.teppanyaki" = "Teppanyaki";
 "type.cuisine.thai" = "Thai";
 "type.cuisine.turkish" = "Turkish";
-"type.cuisine.ukrainian" = "Ukrainian";
-"type.cuisine.uzbek" = "Uzbek";
 "type.cuisine.vegan" = "Vegan";
 "type.cuisine.vegetarian" = "Vegetarian";
-"type.cuisine.venezuelan" = "Venezuelan";
 "type.cuisine.vietnamese" = "Vietnamese";
-"type.cuisine.waffle" = "Waffle";
-"type.cuisine.western" = "Western";
-"type.cuisine.wings" = "Wings";
-"type.cuisine.yakiniku" = "Yakiniku";
-"type.cuisine.yakitori" = "Yakitori";
 "type.emergency" = "Emergency";
 "type.emergency.assembly_point" = "Emergency Assembly Point";
 "type.emergency.defibrillator" = "Defibrillator";