diff --git a/data/presets/golf/bunker.json b/data/presets/golf/bunker.json
index 488dac90..300ef6c8 100644
--- a/data/presets/golf/bunker.json
+++ b/data/presets/golf/bunker.json
@@ -1,9 +1,6 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "name"
-    ],
-    "moreFields": [
         "surface"
     ],
     "geometry": [
@@ -12,10 +9,6 @@
     "tags": {
         "golf": "bunker"
     },
-    "addTags": {
-        "golf": "bunker",
-        "natural": "sand"
-    },
     "terms": [
         "hazard"
     ],
diff --git a/data/presets/golf/fairway.json b/data/presets/golf/fairway.json
index b9c80a3c..76bd09a8 100644
--- a/data/presets/golf/fairway.json
+++ b/data/presets/golf/fairway.json
@@ -1,7 +1,6 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "name",
         "surface"
     ],
     "geometry": [
diff --git a/data/presets/golf/green.json b/data/presets/golf/green.json
index d315d77b..053c05e9 100644
--- a/data/presets/golf/green.json
+++ b/data/presets/golf/green.json
@@ -1,7 +1,6 @@
 {
     "icon": "temaki-golf_green",
     "fields": [
-        "name",
         "surface"
     ],
     "geometry": [
diff --git a/data/presets/golf/hole.json b/data/presets/golf/hole.json
index fe5fb4b5..c7329c91 100644
--- a/data/presets/golf/hole.json
+++ b/data/presets/golf/hole.json
@@ -1,7 +1,6 @@
 {
     "icon": "temaki-golf_green",
     "fields": [
-        "name",
         "ref_golf_hole",
         "par",
         "handicap"
diff --git a/data/presets/golf/lateral_water_hazard.json b/data/presets/golf/lateral_water_hazard.json
index 16e04513..61501644 100644
--- a/data/presets/golf/lateral_water_hazard.json
+++ b/data/presets/golf/lateral_water_hazard.json
@@ -1,8 +1,6 @@
 {
     "icon": "maki-golf",
-    "fields": [
-        "name"
-    ],
+    "fields": [],
     "geometry": [
         "area"
     ],
diff --git a/data/presets/golf/rough.json b/data/presets/golf/rough.json
index 67a520c1..be533a88 100644
--- a/data/presets/golf/rough.json
+++ b/data/presets/golf/rough.json
@@ -1,7 +1,6 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "name",
         "surface"
     ],
     "geometry": [
diff --git a/data/presets/golf/tee.json b/data/presets/golf/tee.json
index 9dc1a6e0..0698eb4a 100644
--- a/data/presets/golf/tee.json
+++ b/data/presets/golf/tee.json
@@ -1,7 +1,6 @@
 {
     "icon": "maki-golf",
     "fields": [
-        "name",
         "surface"
     ],
     "geometry": [
diff --git a/data/presets/golf/water_hazard.json b/data/presets/golf/water_hazard.json
index 5c9e3628..c607a695 100644
--- a/data/presets/golf/water_hazard.json
+++ b/data/presets/golf/water_hazard.json
@@ -1,8 +1,6 @@
 {
     "icon": "maki-golf",
-    "fields": [
-        "name"
-    ],
+    "fields": [],
     "geometry": [
         "area"
     ],