diff --git a/components/MapComponent.js b/components/MapComponent.js
index 946d0b523..f30aeb63c 100644
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -5,7 +5,6 @@ import "leaflet/dist/leaflet.css";
 import "leaflet-contextmenu/dist/leaflet.contextmenu.css";
 import "leaflet-contextmenu";
 import * as config from "../config/config.js";
-import * as urls from "../config/urls.js";
 import "leaflet.smooth_marker_bouncing";
 import OverlappingMarkerSpiderfier from "overlapping-marker-spiderfier-leaflet";
 import DataSheet from "./DataSheet.js";
@@ -15,7 +14,6 @@ import { gisSystemStaticState } from "../store/atoms/gisSystemState.js";
 import { mapLayersState } from "../store/atoms/mapLayersState.js";
 import { selectedAreaState } from "../store/atoms/selectedAreaState.js";
 import { zoomTriggerState } from "../store/atoms/zoomTriggerState.js";
-import { poiTypState } from "../store/atoms/poiTypState.js";
 import AddPoiModalWindow from "./pois/AddPoiModalWindow.js";
 import { poiReadFromDbTriggerAtom } from "../store/atoms/poiReadFromDbTriggerAtom.js";
 import { InformationCircleIcon } from "@heroicons/react/20/solid"; // oder 'outline'
@@ -27,52 +25,26 @@ import "react-toastify/dist/ReactToastify.css";
 import { mapIdState, userIdState } from "../store/atoms/urlParameterState.js";
 import { poiLayerVisibleState } from "../store/atoms/poiLayerVisibleState.js";
 import plusRoundIcon from "./PlusRoundIcon.js";
-import { parsePoint, findClosestPoints } from "../utils/geometryUtils.js";
-import { insertNewPOI, removePOI, handleEditPoi } from "../utils/poiUtils.js";
 import { createAndSetDevices } from "../utils/createAndSetDevices.js";
 import { redrawPolyline, restoreMapSettings, checkOverlappingMarkers } from "../utils/mapUtils.js";
-import circleIcon from "./gisPolylines/icons/CircleIcon.js";
-import startIcon from "./gisPolylines/icons/StartIcon.js";
-import endIcon from "./gisPolylines/icons/EndIcon.js";
 import { fetchGisStatusStations, fetchPriorityConfig, fetchPoiData, updateLocationInDatabase, fetchUserRights, fetchDeviceNameById } from "../services/apiService.js";
-import { addContextMenuToMarker } from "../utils/addContextMenuToMarker.js";
 import { MAP_VERSION } from "../config/settings.js";
 import * as layers from "../config/layers.js";
-import { zoomIn, zoomOut, centerHere } from "../utils/zoomAndCenterUtils.js";
 import { initializeMap } from "../utils/initializeMap.js";
 import { addItemsToMapContextMenu } from "./useMapContextMenu.js";
 import useGmaMarkersLayer from "../hooks/layers/useGmaMarkersLayer.js"; // Import the custom hook
-import useTalasMarkersLayer from "../hooks/layers/useTalasMarkersLayer.js"; // Import the custom hook
-import useEciMarkersLayer from "../hooks/layers/useEciMarkersLayer.js";
-import useTkComponentsMarkersLayer from "../hooks/layers/useTkComponentsMarkersLayer.js";
-import useGsmModemMarkersLayer from "../hooks/layers/useGsmModemMarkersLayer.js";
-import useCiscoRouterMarkersLayer from "../hooks/layers/useCiscoRouterMarkersLayer.js";
-//import useLteModemMarkersLayer from "../hooks/layers/useLteModemMarkersLayer";
-
-import useWagoMarkersLayer from "../hooks/layers/useWagoMarkersLayer.js";
-import useSiemensMarkersLayer from "../hooks/layers/useSiemensMarkersLayer.js";
-import useOtdrMarkersLayer from "../hooks/layers/useOtdrMarkersLayer.js";
-import useWdmMarkersLayer from "../hooks/layers/useWdmMarkersLayer.js";
-import useMessstellenMarkersLayer from "../hooks/layers/useMessstellenMarkersLayer.js";
-import useTalasiclMarkersLayer from "../hooks/layers/useTalasiclMarkersLayer.js";
-import useDauzMarkersLayer from "../hooks/layers/useDauzMarkersLayer.js";
 import useSmsfunkmodemMarkersLayer from "../hooks/layers/useSmsfunkmodemMarkersLayer.js";
-import useUlafMarkersLayer from "../hooks/layers/useUlafMarkersLayer.js";
-import useSonstigeMarkersLayer from "../hooks/layers/useSonstigeMarkersLayer.js";
-import handlePoiSelect from "../utils/handlePoiSelect.js";
 import { fetchGisStationsStaticDistrict, fetchGisStationsStatusDistrict, fetchGisStationsMeasurements, fetchGisSystemStatic } from "../services/fetchData.js";
 import { setupPolylines } from "../utils/setupPolylines.js";
 import { setupPOIs } from "../utils/setupPOIs.js";
 import VersionInfoModal from "./VersionInfoModal.js";
 //--------------------------------------------
-import PoiUpdateModalWrapper from "./pois/PoiUpdateModalWrapper";
-import AddPoiModalWindowWrapper from "./pois/AddPoiModalWindowWrapper";
+
 import useFetchPoiData from "../hooks/useFetchPoiData";
 import usePoiTypData from "../hooks/usePoiTypData";
-import useMarkerLayers from "../hooks/useMarkerLayers";
 import useLayerVisibility from "../hooks/useLayerVisibility";
 import useLineData from "../hooks/useLineData.js";
-import useCreateAndSetDevices from "../hooks/useCreateAndSetDevices";
+
 //import { useCreateAndSetDevices } from "../hooks/useCreateAndSetDevices";
 import { useMapComponentState } from "../hooks/useMapComponentState";
 import { polylineEventsDisabledState } from "../store/atoms/polylineEventsDisabledState";
diff --git a/hooks/layers/useLteModemMarkersLayer.js b/hooks/layers/useLteModemMarkersLayer.js
deleted file mode 100644
index 57ee511da..000000000
--- a/hooks/layers/useLteModemMarkersLayer.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/* // hooks/useLteModemMarkersLayer.js das ist GSM Modem
-import { useEffect, useState } from "react";
-import L from "leaflet";
-import { createAndSetDevices } from "../../utils/createAndSetDevices";
-import { addContextMenuToMarker } from "../../utils/addContextMenuToMarker";
-import { checkOverlappingMarkers } from "../../utils/mapUtils";
-
-const useLteModemMarkersLayer = (map, oms, GisSystemStatic, priorityConfig) => {
-  const [lteModemMarkers, setLteModemMarkers] = useState([]);
-
-  useEffect(() => {
-    if (GisSystemStatic && GisSystemStatic.length && map) {
-      createAndSetDevices(10, setLteModemMarkers, GisSystemStatic, priorityConfig); // LTE Modems
-    }
-  }, [GisSystemStatic, map, priorityConfig]);
-
-  useEffect(() => {
-    if (map && lteModemMarkers.length) {
-      lteModemMarkers.forEach((marker) => {
-        marker.addTo(map);
-        oms.addMarker(marker);
-
-        // Popup on mouseover and mouseout
-        marker.on("mouseover", function () {
-          this.openPopup();
-        });
-        marker.on("mouseout", function () {
-          this.closePopup();
-        });
-
-        addContextMenuToMarker(marker);
-      });
-
-      // Disable map context menu
-      map.options.contextmenu = false;
-      map.options.contextmenuItems = [];
-
-      oms.map.options.contextmenu = false;
-      oms.map.options.contextmenuItems = [];
-
-      // Call the function to check for overlapping markers
-      checkOverlappingMarkers(oms, map);
-    }
-  }, [map, lteModemMarkers]);
-
-  return lteModemMarkers;
-};
-
-export default useLteModemMarkersLayer;
- */
diff --git a/hooks/layers/useTkComponentsMarkersLayer.js b/hooks/layers/useTkComponentsMarkersLayer.js
index 100d65e30..026708a97 100644
--- a/hooks/layers/useTkComponentsMarkersLayer.js
+++ b/hooks/layers/useTkComponentsMarkersLayer.js
@@ -12,6 +12,7 @@ const useTkComponentsMarkersLayer = (map, oms, GisSystemStatic, priorityConfig)
     if (GisSystemStatic && GisSystemStatic.length && map) {
       createAndSetDevices(2, setTkComponentsMarkers, GisSystemStatic, priorityConfig); // ECI-System
     }
+    GisSystemStatic.filter((system) => system.IdSystem === 30).forEach((station) => console.log("Koordinaten für TK-Komponenten wird von hier nie aufgerufen:", station.Latitude, station.Longitude));
   }, [GisSystemStatic, map, priorityConfig]);
 
   useEffect(() => {