diff --git a/data/fields/house.json b/data/fields/house.json
index e7fc4f6b..4507d5e2 100644
--- a/data/fields/house.json
+++ b/data/fields/house.json
@@ -1,38 +1,5 @@
 {
     "key": "house",
     "type": "combo",
-    "label": "House Type",
-    "strings": {
-        "options": {
-            "bungalow": {
-                "title": "Bungalow",
-                "description": "A small house with a single storey"
-            },
-            "detached": {
-                "title": "Detached House",
-                "description": "A house that is not connected to any other houses"
-            },
-            "link-detached": {
-                "title": "Link-Detached House",
-                "description": "A house that is connected to another house by a garage or other non-living area"
-            },
-            "maisonette": {
-                "title": "Maisonette",
-                "description": "A residential dwelling, split over two floors with private external entrances rather than a communal entrance"
-            },
-            "semi-detached": {
-                "title": "Semi-Detached House",
-                "description": "A house that is attached to another house on one side"
-            },
-            "terrace": {
-                "title": "Row of Townhouses",
-                "description": "A row of houses that are attached to each other in a line (mapping each house as a separate area is preferred)"
-            },
-            "terraced": {
-                "title": "Single Townhouse",
-                "description": "Individual house in a row of townhouses"
-            }
-        }
-    },
-    "autoSuggestions": false
+    "label": "House Type"
 }
diff --git a/data/fields/water_source.json b/data/fields/water_source.json
index b0da623c..cea55812 100644
--- a/data/fields/water_source.json
+++ b/data/fields/water_source.json
@@ -8,8 +8,7 @@
             "water_tank": "Water Tank",
             "pond": "Pond",
             "river": "River",
-            "stream": "Stream",
-            "groundwater": "Groundwater"
+            "stream": "Stream"
         }
     }
 }
diff --git a/data/presets/building/house.json b/data/presets/building/house.json
index d2a05461..87c937de 100644
--- a/data/presets/building/house.json
+++ b/data/presets/building/house.json
@@ -4,8 +4,8 @@
         "area"
     ],
     "fields": [
-        "house",
-        "{building}"
+        "{building}",
+        "house"
     ],
     "tags": {
         "building": "house"
diff --git a/data/presets/building/house/_detached.json b/data/presets/building/house/_detached.json
index 9f751ef9..b20361cb 100644
--- a/data/presets/building/house/_detached.json
+++ b/data/presets/building/house/_detached.json
@@ -3,10 +3,6 @@
     "geometry": [
         "area"
     ],
-    "fields": [
-        "house",
-        "{building}"
-    ],
     "tags": {
         "building": "house",
         "house": "detached"
diff --git a/data/presets/building/house/_semi-detached.json b/data/presets/building/house/_semi-detached.json
index 4bd07c02..57ada385 100644
--- a/data/presets/building/house/_semi-detached.json
+++ b/data/presets/building/house/_semi-detached.json
@@ -3,10 +3,6 @@
     "geometry": [
         "area"
     ],
-    "fields": [
-        "house",
-        "{building}"
-    ],
     "tags": {
         "building": "house",
         "house": "semi-detached"
diff --git a/data/presets/building/house/_terrace.json b/data/presets/building/house/_terrace.json
index 53fb7947..753c8714 100644
--- a/data/presets/building/house/_terrace.json
+++ b/data/presets/building/house/_terrace.json
@@ -3,10 +3,6 @@
     "geometry": [
         "area"
     ],
-    "fields": [
-        "house",
-        "{building}"
-    ],
     "tags": {
         "building": "house",
         "house": "terrace"
diff --git a/data/presets/building/house/terraced.json b/data/presets/building/house/terraced.json
index 6627f68e..e99640b4 100644
--- a/data/presets/building/house/terraced.json
+++ b/data/presets/building/house/terraced.json
@@ -3,10 +3,6 @@
     "geometry": [
         "area"
     ],
-    "fields": [
-        "house",
-        "{building}"
-    ],
     "tags": {
         "building": "house",
         "house": "terraced"