diff --git a/src/UI/BigComponents/GeolocationControl.ts b/src/Logic/State/GeolocationControlState.ts
similarity index 100%
rename from src/UI/BigComponents/GeolocationControl.ts
rename to src/Logic/State/GeolocationControlState.ts
diff --git a/src/Models/ThemeViewState/UserMapFeatureswitchState.ts b/src/Models/ThemeViewState/UserMapFeatureswitchState.ts
index f6cfbc442..98f7f9ad2 100644
--- a/src/Models/ThemeViewState/UserMapFeatureswitchState.ts
+++ b/src/Models/ThemeViewState/UserMapFeatureswitchState.ts
@@ -18,7 +18,6 @@ import { FeatureSource, WritableFeatureSource } from "../../Logic/FeatureSource/
 import FullNodeDatabaseSource from "../../Logic/FeatureSource/TiledFeatureSource/FullNodeDatabaseSource"
 import { WithUserRelatedState } from "./WithUserRelatedState"
 import GeoLocationHandler from "../../Logic/Actors/GeoLocationHandler"
-import { GeolocationControlState } from "../../UI/BigComponents/GeolocationControl"
 import ShowOverlayRasterLayer from "../../UI/Map/ShowOverlayRasterLayer"
 import { BBox } from "../../Logic/BBox"
 import ShowDataLayer from "../../UI/Map/ShowDataLayer"
@@ -26,6 +25,7 @@ import { OfflineBasemapManager } from "../../Logic/OfflineBasemapManager"
 import { IsOnline } from "../../Logic/Web/IsOnline"
 import { Tiles } from "../TileRange"
 import { LocalStorageSource } from "../../Logic/Web/LocalStorageSource"
+import { GeolocationControlState } from "../../Logic/State/GeolocationControlState"
 
 /**
  * The first core of the state management; everything related to:
@@ -273,7 +273,6 @@ export class UserMapFeatureswitchState extends WithUserRelatedState {
      *
      * Note: this method is _incorrectly_ marked as not used
      */
-    // @ts-ignore
     public showCurrentLocationOn(map: Store<MlMap>) {
         const id = "gps_location"
         const layer = this.theme.getLayer(id)
diff --git a/src/UI/BigComponents/GeolocationIndicator.svelte b/src/UI/BigComponents/GeolocationIndicator.svelte
index 69cacf5f7..bcd5ad55d 100644
--- a/src/UI/BigComponents/GeolocationIndicator.svelte
+++ b/src/UI/BigComponents/GeolocationIndicator.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import Location_refused from "../../assets/svg/Location_refused.svelte"
   import { Store } from "../../Logic/UIEventSource.js"
-  import type { GeolocationPermissionState } from "../../Logic/State/GeoLocationState.js"
+  import type { GeolocationPermissionState } from "../../Logic/State/GeoLocationState"
   import ThemeViewState from "../../Models/ThemeViewState"
   import Location_locked from "../../assets/svg/Location_locked.svelte"
   import Location_unlocked from "../../assets/svg/Location_unlocked.svelte"
diff --git a/src/UI/BigComponents/SimpleAddUI.ts b/src/UI/BigComponents/SimpleAddUI.ts
deleted file mode 100644
index 3aed7d734..000000000
--- a/src/UI/BigComponents/SimpleAddUI.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Asks to add a feature at the last clicked location, at least if zoom is sufficient
- */
-import BaseUIElement from "../BaseUIElement"
-import PresetConfig from "../../Models/ThemeConfig/PresetConfig"
-import FilteredLayer from "../../Models/FilteredLayer"
-
-/*
- * The SimpleAddUI is a single panel, which can have multiple states:
- * - A list of presets which can be added by the user
- * - A 'confirm-selection' button (or alternatively: please enable the layer)
- * - A 'something is wrong - please soom in further'
- * - A 'read your unread messages before adding a point'
- */
-
-export interface PresetInfo extends PresetConfig {
-    name: string | BaseUIElement
-    icon: () => BaseUIElement
-    layerToAddTo: FilteredLayer
-    boundsFactor?: 0.25 | number
-}