diff --git a/icons.json b/icons.json
index 29397498..61240fd9 100644
--- a/icons.json
+++ b/icons.json
@@ -410,7 +410,6 @@
     "roentgen-lattice_guyed",
     "roentgen-mini_bumps",
     "roentgen-needleleaved_tree",
-    "roentgen-plane",
     "roentgen-pole_dancer",
     "roentgen-power_pole_1_level",
     "roentgen-power_pole_2_level",
diff --git a/source_strings.yaml b/source_strings.yaml
index 0d9970d6..9286d10a 100644
--- a/source_strings.yaml
+++ b/source_strings.yaml
@@ -248,31 +248,6 @@ en:
         label: Air Conditioning
         # 'terms: cooling system,refrigeration'
         terms: '[translate with synonyms or related terms for ''Air Conditioning'', separated by commas]'
-      aircraft/model:
-        # aircraft:model=*
-        label: Aircraft Model
-      aircraft/model/wikidata:
-        # aircraft:model:wikidata=*, aircraft:model:wikipedia=*
-        label: Aircraft Model Wikidata
-        terms: '[translate with synonyms or related terms for ''Aircraft Model Wikidata'', separated by commas]'
-      aircraft/type:
-        # aircraft:type=*
-        label: Type
-        options:
-          # aircraft:type=airliner
-          airliner: Airliner
-          # aircraft:type=cargo
-          cargo: Cargo
-          # aircraft:type=fixed_wing
-          fixed_wing: Fixed Wing
-          # aircraft:type=glider
-          glider: Glider
-          # aircraft:type=helicopter
-          helicopter: Helicopter
-          # aircraft:type=jet
-          jet: Jet
-          # aircraft:type=military
-          military: Military
       alt_name:
         # alt_name=*
         label: Alternative Name
@@ -3318,10 +3293,6 @@ en:
         # manufacturer=*
         label: Manufacturer
         terms: '[translate with synonyms or related terms for ''Manufacturer'', separated by commas]'
-      manufacturer/wikidata:
-        # manufacturer:wikidata=*, manufacturer:wikipedia=*
-        label: Manufacturer Wikidata
-        terms: '[translate with synonyms or related terms for ''Manufacturer Wikidata'', separated by commas]'
       map_size:
         # map_size=*
         label: Coverage
@@ -6759,11 +6730,6 @@ en:
         name: Coffeehouse
         # 'terms: americano,brew,cafe,café,caffe,caffè,cappuccino,cocoa,coffee shop,drip,espresso,hot drinks,latte,macchiato,tea'
         terms: <translate with synonyms or related terms for 'Coffeehouse', separated by commas>
-      amenity/cafe/teahouse:
-        # amenity=cafe + cuisine=tea | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Teahouse
-        # 'terms: tea house,tearoom,tea room,tea,tea drink,black tea,green tea,yellow tea,white tea,oolong tea,hot drinks'
-        terms: <translate with synonyms or related terms for 'Teahouse', separated by commas>
       amenity/car_pooling:
         # amenity=car_pooling | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Car Pooling Station
@@ -9828,11 +9794,6 @@ en:
         # historic=* | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Historic Site
         terms: <translate with synonyms or related terms for 'Historic Site', separated by commas>
-      historic/aircraft:
-        # historic=aircraft | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
-        name: Historic Aircraft
-        # 'terms: gate guardian'
-        terms: <translate with synonyms or related terms for 'Historic Aircraft', separated by commas>
       historic/archaeological_site:
         # historic=archaeological_site | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).
         name: Archaeological Site