diff --git a/assets/layers/animal_shelter/animal_shelter.json b/assets/layers/animal_shelter/animal_shelter.json
index c77f92ae45..ca212bed73 100644
--- a/assets/layers/animal_shelter/animal_shelter.json
+++ b/assets/layers/animal_shelter/animal_shelter.json
@@ -118,4 +118,4 @@
   "description": {
     "en": "An animal shelter is a facility where animals in trouble are brought and facility's staff (volunteers or not) feeds them and cares of them, rehabilitating and healing them if necessary. This definition includes kennels for abandoned dogs, catteries for abandoned cats, shelters for other abandoned pets and wildlife recovery centres. "
   }
-}
\ No newline at end of file
+}
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index ead3cf3f01..43f0c3b18e 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -5466,4 +5466,4 @@
     },
     "neededChangesets": 10
   }
-}
\ No newline at end of file
+}
diff --git a/assets/layers/climbing_opportunity/climbing_opportunity.json b/assets/layers/climbing_opportunity/climbing_opportunity.json
index 8479f07913..d0f12b1c85 100644
--- a/assets/layers/climbing_opportunity/climbing_opportunity.json
+++ b/assets/layers/climbing_opportunity/climbing_opportunity.json
@@ -145,4 +145,4 @@
       "width": "2"
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/drinking_water/drinking_water.json b/assets/layers/drinking_water/drinking_water.json
index 99e2779b2c..bf78048368 100644
--- a/assets/layers/drinking_water/drinking_water.json
+++ b/assets/layers/drinking_water/drinking_water.json
@@ -48,7 +48,6 @@
     "_closest_other_drinking_water_id=get(feat)('_closest_other_drinking_water')?.id",
     "_closest_other_drinking_water_distance=Math.floor(Number(get(feat)('_closest_other_drinking_water')?.distance))"
   ],
-  "minzoom": 13,
   "presets": [
     {
       "title": {
@@ -206,7 +205,6 @@
         "amenity="
       ]
     },
-    "neededChangesets": 1,
     "nonDeleteMappings": [
       {
         "if": {
diff --git a/assets/layers/questions/questions.json b/assets/layers/questions/questions.json
index fd43930ad9..f1553ad935 100644
--- a/assets/layers/questions/questions.json
+++ b/assets/layers/questions/questions.json
@@ -2400,7 +2400,9 @@
     },
     {
       "id": "sugar_free",
-      "labels": ["diets"],
+      "labels": [
+        "diets"
+      ],
       "question": {
         "en": "Does this shop have a sugar free offering?",
         "de": "Verkauft das Geschäft zuckerfreie Produkte?"
@@ -2442,7 +2444,9 @@
     },
     {
       "id": "lactose_free",
-      "labels": ["diets"],
+      "labels": [
+        "diets"
+      ],
       "question": {
         "en": "Does {title()} have a lactose-free offering?",
         "de": "Verkauft {title()} laktosefreie Produkte?"
@@ -2480,7 +2484,9 @@
     },
     {
       "id": "gluten_free",
-      "labels": ["diets"],
+      "labels": [
+        "diets"
+      ],
       "question": {
         "en": "Does this shop have a gluten free offering?",
         "de": "Verkauft das Geschäft glutenfreie Produkte?"
diff --git a/assets/layers/transit_stops/transit_stops.json b/assets/layers/transit_stops/transit_stops.json
index 7c1b1beb9e..9eb21b82f9 100644
--- a/assets/layers/transit_stops/transit_stops.json
+++ b/assets/layers/transit_stops/transit_stops.json
@@ -42,19 +42,6 @@
       }
     ]
   },
-  "mapRendering": [
-    {
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "icon": {
-        "render": "./assets/layers/transit_stops/bus_stop.svg",
-        "mappings": []
-      },
-      "label": "<div style=\"background: white; display: block\">{name}</div>"
-    }
-  ],
   "tagRenderings": [
     {
       "id": "stop_name",