diff --git a/data/fields/aircraft/model.json b/data/fields/aircraft/model.json
deleted file mode 100644
index c21e77a9..00000000
--- a/data/fields/aircraft/model.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "key": "aircraft:model",
-    "type": "combo",
-    "label": "Aircraft Model"
-}
diff --git a/data/fields/aircraft/model/wikidata.json b/data/fields/aircraft/model/wikidata.json
deleted file mode 100644
index c1f72760..00000000
--- a/data/fields/aircraft/model/wikidata.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "key": "aircraft:model:wikidata",
-    "keys": [
-        "aircraft:model:wikidata",
-        "aircraft:model:wikipedia"
-    ],
-    "type": "wikidata",
-    "label": "Aircraft Model Wikidata"
-}
diff --git a/data/fields/aircraft/type.json b/data/fields/aircraft/type.json
deleted file mode 100644
index ea2d5226..00000000
--- a/data/fields/aircraft/type.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "key": "aircraft:type",
-    "type": "combo",
-    "label": "Type",
-    "strings": {
-        "options": {
-            "military": "Military",
-            "helicopter": "Helicopter",
-            "airliner": "Airliner",
-            "jet": "Jet",
-            "fixed_wing": "Fixed Wing",
-            "cargo": "Cargo",
-            "glider": "Glider"
-        }
-    }
-}
diff --git a/data/fields/manufacturer/wikidata.json b/data/fields/manufacturer/wikidata.json
deleted file mode 100644
index 5c42886b..00000000
--- a/data/fields/manufacturer/wikidata.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "key": "manufacturer:wikidata",
-    "keys": [
-        "manufacturer:wikidata",
-        "manufacturer:wikipedia"
-    ],
-    "type": "wikidata",
-    "label": "Manufacturer Wikidata"
-}
diff --git a/data/presets/amenity/cafe/teahouse.json b/data/presets/amenity/cafe/teahouse.json
deleted file mode 100644
index 5eec4c69..00000000
--- a/data/presets/amenity/cafe/teahouse.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "icon": "maki-cafe",
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "amenity": "cafe",
-        "cuisine": "tea"
-    },
-    "reference": {
-        "key": "amenity",
-        "value": "cafe"
-    },
-    "terms": [
-        "teahouse",
-        "tea house",
-        "tearoom",
-        "tea room",
-        "tea",
-        "tea drink",
-        "black tea",
-        "green tea",
-        "yellow tea",
-        "white tea",
-        "oolong tea",
-        "hot drinks"
-    ],
-    "name": "Teahouse"
-}
diff --git a/data/presets/historic/aircraft.json b/data/presets/historic/aircraft.json
deleted file mode 100644
index 426e1732..00000000
--- a/data/presets/historic/aircraft.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "icon": "roentgen-plane",
-    "fields": [
-        "name",
-        "start_date",
-        "aircraft/type",
-        "aircraft/model"
-    ],
-    "moreFields": [
-        "ref",
-        "aircraft/model/wikidata",
-        "manufacturer",
-        "manufacturer/wikidata",
-        "description"
-    ],
-    "geometry": [
-        "point",
-        "area"
-    ],
-    "tags": {
-        "historic": "aircraft"
-    },
-    "terms": [
-        "gate guardian"
-    ],
-    "name": "Historic Aircraft"
-}