diff --git a/assets/layers/atm/atm.json b/assets/layers/atm/atm.json
index 251915e39c..8388e6d1ca 100644
--- a/assets/layers/atm/atm.json
+++ b/assets/layers/atm/atm.json
@@ -154,10 +154,6 @@
       },
       "freeform": {
         "key": "brand",
-        "type": "nsi",
-        "helperArgs": [
-          "amenity=atm"
-        ],
         "placeholder": {
           "en": "Brand name",
           "de": "Markenname",
@@ -674,4 +670,4 @@
     "enableImproveAccuracy": true,
     "enableRelocation": false
   }
-}
\ No newline at end of file
+}
diff --git a/assets/layers/parcel_lockers/parcel_lockers.json b/assets/layers/parcel_lockers/parcel_lockers.json
index 5b51a38fa0..01abcea4e0 100644
--- a/assets/layers/parcel_lockers/parcel_lockers.json
+++ b/assets/layers/parcel_lockers/parcel_lockers.json
@@ -110,10 +110,6 @@
       },
       "freeform": {
         "key": "brand",
-        "type": "nsi",
-        "helperArgs": [
-          "amenity=parcel_locker"
-        ],
         "placeholder": {
           "en": "Brand",
           "de": "Marke",
@@ -308,4 +304,4 @@
   "allowMove": {
     "enableImproveAccuracy": true
   }
-}
\ No newline at end of file
+}
diff --git a/assets/layers/postoffices/postoffices.json b/assets/layers/postoffices/postoffices.json
index 19f0cc83d0..3982fe5d76 100644
--- a/assets/layers/postoffices/postoffices.json
+++ b/assets/layers/postoffices/postoffices.json
@@ -218,17 +218,13 @@
         "ca": "Aquesta és una oficina postal de {brand}"
       },
       "freeform": {
-        "type": "nsi",
         "key": "brand",
         "placeholder": {
           "en": "Brand of the post office",
           "de": "Marke der Poststelle",
           "es": "Marca de la oficina de correos",
           "ca": "Marca de l'oficina postal"
-        },
-        "helperArgs": [
-          "amenity=post_office"
-        ]
+        }
       }
     },
     {
diff --git a/src/UI/Image/UploadImage.svelte b/src/UI/Image/UploadImage.svelte
index fd2f0c5796..58bb0404cb 100644
--- a/src/UI/Image/UploadImage.svelte
+++ b/src/UI/Image/UploadImage.svelte
@@ -21,7 +21,6 @@
 
   export let tags: UIEventSource<OsmTags>
   export let targetKey: string = undefined
-  export let layer: LayerConfig
   export let noBlur: boolean = false
   export let feature: Feature
   /**
diff --git a/src/UI/OpeningHours/OpeningHoursVisualization.ts b/src/UI/OpeningHours/OpeningHoursVisualization.ts
index 40d59f86f5..c513a44dd4 100644
--- a/src/UI/OpeningHours/OpeningHoursVisualization.ts
+++ b/src/UI/OpeningHours/OpeningHoursVisualization.ts
@@ -94,7 +94,7 @@ export default class OpeningHoursVisualization extends Toggle {
         rangeStart: Date
     ): BaseUIElement {
         const isWeekstable: boolean = oh.isWeekStable()
-        let [changeHours, changeHourText] = OH.allChangeMoments(ranges)
+        const [changeHours, changeHourText] = OH.allChangeMoments(ranges)
         const today = new Date()
         today.setHours(0, 0, 0, 0)
 
@@ -298,10 +298,6 @@ export default class OpeningHoursVisualization extends Toggle {
             }
             return Translations.t.general.opening_hours.closed_permanently.Clone()
         }
-        const willOpenAt = `${opensAtDate.getDate()}/${opensAtDate.getMonth() + 1} ${OH.hhmm(
-            opensAtDate.getHours(),
-            opensAtDate.getMinutes()
-        )}`
         return Translations.t.general.opening_hours.closed_until.Subs({
             date: opensAtDate.toLocaleString(),
         })
diff --git a/src/UI/Popup/MinimapViz.svelte b/src/UI/Popup/MinimapViz.svelte
index 0dc02d3ad1..15cbd37685 100644
--- a/src/UI/Popup/MinimapViz.svelte
+++ b/src/UI/Popup/MinimapViz.svelte
@@ -7,8 +7,6 @@
   import ShowDataLayer from "../Map/ShowDataLayer"
   import StaticFeatureSource from "../../Logic/FeatureSource/Sources/StaticFeatureSource"
   import MaplibreMap from "../Map/MaplibreMap.svelte"
-  import Loading from "../Base/Loading.svelte"
-  import { Utils } from "../../Utils"
   import DelayedComponent from "../Base/DelayedComponent.svelte"
 
   export let state: SpecialVisualizationState
diff --git a/src/UI/SpecialVisualisations/NoteVisualisations.ts b/src/UI/SpecialVisualisations/NoteVisualisations.ts
index a4d8891557..f1886f8386 100644
--- a/src/UI/SpecialVisualisations/NoteVisualisations.ts
+++ b/src/UI/SpecialVisualisations/NoteVisualisations.ts
@@ -1,8 +1,4 @@
-import {
-    SpecialVisualization,
-    SpecialVisualizationState,
-    SpecialVisualizationSvelte,
-} from "../SpecialVisualization"
+import { SpecialVisualization, SpecialVisualizationState, SpecialVisualizationSvelte } from "../SpecialVisualization"
 import Constants from "../../Models/Constants"
 import { UIEventSource } from "../../Logic/UIEventSource"
 import { Feature } from "geojson"
@@ -136,10 +132,10 @@ export class NoteVisualisations {
                 group: "notes",
                 needsUrls: [Imgur.apiUrl, ...Imgur.supportingUrls],
 
-                constr: (state, tags, args, feature, layer) => {
+                constr: (state, tags, args, feature) => {
                     const id = tags.data[args[0] ?? "id"]
                     tags = state.featureProperties.getStore(id)
-                    return new SvelteUIElement(UploadImage, { state, tags, layer, feature })
+                    return new SvelteUIElement(UploadImage, { state, tags, feature })
                 },
             },
             {