diff --git a/assets/templates/style-switcher.njk b/assets/templates/style-switcher.njk
index fab6c31e5..d48cac904 100644
--- a/assets/templates/style-switcher.njk
+++ b/assets/templates/style-switcher.njk
@@ -7,7 +7,7 @@
 {% block head %}
   <link href="/public/stylesheets/application.css" rel="stylesheet" type="text/css">
   <link href="/plugin-assets/%40defra%2Finteractive-map/dist/css/index.css" rel="stylesheet" type="text/css">
-  <link href="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/map-styles/dist/css/index.css" rel="stylesheet" type="text/css">
+  <link href="/plugin-assets/%40defra%2Finteractive-map/plugins/map-styles/dist/css/index.css" rel="stylesheet" type="text/css">
 {% endblock %}
 
 {% block bodyStart %}
@@ -39,7 +39,7 @@
   <!-- Defra library scripts -->
   <script src="/plugin-assets/%40defra%2Finteractive-map/dist/umd/index.js"></script>
   <script src="/plugin-assets/%40defra%2Finteractive-map/providers/maplibre/dist/umd/index.js"></script>
-  <script src="/plugin-assets/%40defra%2Finteractive-map/plugins/beta/map-styles/dist/umd/index.js"></script>
+  <script src="/plugin-assets/%40defra%2Finteractive-map/plugins/map-styles/dist/umd/index.js"></script>
 
   <script>
     const attribution = 'OpenFreeMap © OpenMapTiles Data from OpenStreetMap'
diff --git a/demo/DemoMapStyleSwitcher.js b/demo/DemoMapStyleSwitcher.js
index 40eb787b0..98a960911 100644
--- a/demo/DemoMapStyleSwitcher.js
+++ b/demo/DemoMapStyleSwitcher.js
@@ -50,7 +50,7 @@ function MapInner () {
     Promise.all([
       import('../src/index.js'),
       import('../providers/maplibre/src/index.js'),
-      import('../plugins/beta/map-styles/src/index.js')
+      import('../plugins/map-styles/src/index.js')
     ]).then(([
       { default: InteractiveMap },
       { default: maplibreProvider },
diff --git a/demo/js/draw-ol.js b/demo/js/draw-ol.js
index 9ce42df9c..3e8b71060 100644
--- a/demo/js/draw-ol.js
+++ b/demo/js/draw-ol.js
@@ -1,12 +1,12 @@
-// InteractiveMap with OpenLayers provider and draw-ol plugin
+// InteractiveMap with OpenLayers provider and draw plugin
 import InteractiveMap from '../../src/index.js'
 import { vtsMapStyles27700, ngdMapStyles27700, apgbAerialStyle } from './mapStyles.js'
 import { transformGeocodeRequest, transformVtsRequest27700 } from './auth.js'
 // Providers
-import openLayersProvider from '/providers/beta/openlayers/src/index.js'
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
+import openLayersProvider from '/providers/openlayers/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
 // Plugins
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
 import createDrawPlugin from '/plugins/draw/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
diff --git a/demo/js/draw.js b/demo/js/draw.js
index 885223871..31b82fbf6 100755
--- a/demo/js/draw.js
+++ b/demo/js/draw.js
@@ -5,13 +5,13 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/src/index.js'
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
 // Plugins
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
 import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createMapKeyPlugin from '/plugins/map-key/src/index.js'
 import createDrawPlugin from '/plugins/draw/src/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
 
diff --git a/demo/js/esm.js b/demo/js/esm.js
index 71988d877..bdfbeb934 100644
--- a/demo/js/esm.js
+++ b/demo/js/esm.js
@@ -4,16 +4,16 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/dist/esm/index.js'
-import openNamesProvider from '/providers/beta/open-names/dist/esm/index.js'
+import openNamesProvider from '/providers/open-names/dist/esm/index.js'
 // Plugins
-import mapStylesPlugin from '/plugins/beta/map-styles/dist/esm/index.js'
+import mapStylesPlugin from '/plugins/map-styles/dist/esm/index.js'
 import createDatasetsPlugin from '/plugins/datasets/dist/esm/index.js'
 import createMapKeyPlugin from '/plugins/map-key/dist/esm/index.js'
 import createDrawPlugin from '/plugins/draw/dist/esm/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/dist/esm/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/dist/esm/index.js'
 import searchPlugin from '/plugins/search/dist/esm/index.js'
 import createInteractPlugin from '/plugins/interact/dist/esm/index.js'
-import createFramePlugin from '/plugins/beta/frame/dist/esm/index.js'
+import createFramePlugin from '/plugins/frame/dist/esm/index.js'
 
 const pointData = {
   type: 'FeatureCollection',
diff --git a/demo/js/esri-datasets.js b/demo/js/esri-datasets.js
index 86b5856fa..d6355044a 100644
--- a/demo/js/esri-datasets.js
+++ b/demo/js/esri-datasets.js
@@ -1,14 +1,14 @@
 import InteractiveMap from '../../src/index.js'
-import esriProvider from '/providers/beta/esri/src/index.js'
+import esriProvider from '/providers/esri/src/index.js'
 // Plugins
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
 import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createMapKeyPlugin from '/plugins/map-key/src/index.js'
 import createMenuPlugin from '/plugins/menu/src/index.js'
 // Setup
 import { vtsMapStyles27700 } from './mapStyles.js'
 import { drawPlugin, framePlugin, attachDrawPlugin } from './planning/drawPlugin.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import { transformGeocodeRequest, transformVtsRequest3857, setupEsriConfig } from './auth.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
diff --git a/demo/js/farming.js b/demo/js/farming.js
index 2621ab885..aa88d3cad 100755
--- a/demo/js/farming.js
+++ b/demo/js/farming.js
@@ -4,17 +4,17 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/src/index.js'
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
 // Plugins
-import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
+import useLocationPlugin from '/plugins/use-location/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
 import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createMapKeyPlugin from '/plugins/map-key/src/index.js'
-import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import createDrawPlugin from '/plugins/draw/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
-import createFramePlugin from '/plugins/beta/frame/src/index.js'
+import createFramePlugin from '/plugins/frame/src/index.js'
 
 var feature = { id: 'test1234', type: 'Feature', geometry: { coordinates: [[[-2.9406643378873127,54.918060570259456],[-2.9092219779267054,54.91564249172612],[-2.904350626383433,54.90329530000005],[-2.909664828067463,54.89540129642464],[-2.9225074821353587,54.88979816151294],[-2.937121536764323,54.88826989853317],[-2.95682836800691,54.88916139231736],[-2.965463945742613,54.898966521920045],[-2.966349646023133,54.910805898763385],[-2.9406643378873127,54.918060570259456]]], type: 'Polygon' }}
 
diff --git a/demo/js/gep.js b/demo/js/gep.js
index a96306def..aab33ca1c 100644
--- a/demo/js/gep.js
+++ b/demo/js/gep.js
@@ -3,11 +3,11 @@ import { vtsMapStyles27700, apgbAerialStyle } from './mapStyles.js'
 import { transformGeocodeRequest, transformVtsRequest27700 } from './auth.js'
 import '/plugins/datasets/src/datasets.scss' // in a separate repo: import '@defra/interactive-map/plugins/datasets/css'
 // Providers
-import openLayersProvider from '/providers/beta/openlayers/src/index.js'
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
+import openLayersProvider from '/providers/openlayers/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
 // Plugins
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
 // GEP demo utils
diff --git a/demo/js/index-ol.js b/demo/js/index-ol.js
index cd677f691..1e2416bc2 100644
--- a/demo/js/index-ol.js
+++ b/demo/js/index-ol.js
@@ -2,10 +2,10 @@ import InteractiveMap from '../../src/index.js'
 import { vtsMapStyles27700 } from './mapStyles.js'
 import { transformGeocodeRequest, transformVtsRequest27700 } from './auth.js'
 // Providers
-import openLayersProvider from '/providers/beta/openlayers/src/index.js'
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
+import openLayersProvider from '/providers/openlayers/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
 // Plugins
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
 import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createMapKeyPlugin from '/plugins/map-key/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
diff --git a/demo/js/index.js b/demo/js/index.js
index bbe389d26..9f4df4867 100755
--- a/demo/js/index.js
+++ b/demo/js/index.js
@@ -1,12 +1,11 @@
 // CSS
 // import '../../dist/css/index.css'
-// import '/plugins/beta/map-styles/dist/css/index.css'
+// import '/plugins/map-styles/dist/css/index.css'
 // import '/plugins/datasets/dist/css/index.css'
-// import '/plugins/beta/draw-ml/dist/css/index.css'
-// import '/plugins/beta/scale-bar/dist/css/index.css'
+// import '/plugins/scale-bar/dist/css/index.css'
 // import '/plugins/search/dist/css/index.css'
 // import '/plugins/interact/dist/css/index.css'
-// import '/plugins/beta/frame/dist/css/index.css'
+// import '/plugins/frame/dist/css/index.css'
 // InteractiveMap
 import InteractiveMap from '../../src/index.js'
 import { openMapStyles, vtsMapStyles3857 } from './mapStyles.js'
@@ -14,17 +13,16 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/src/index.js'
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
 // Plugins
-import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
+import useLocationPlugin from '/plugins/use-location/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
 import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createMapKeyPlugin from '/plugins/map-key/src/index.js'
-// import createDrawPlugin from '/plugins/beta/draw-ml/src/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
-import createFramePlugin from '/plugins/beta/frame/src/index.js'
+import createFramePlugin from '/plugins/frame/src/index.js'
 import { shieldSymbolSvg } from './customSymbols.js'
 
 const POINT_DATA = {
diff --git a/demo/js/mapStyles.js b/demo/js/mapStyles.js
index b0e19695f..9d34a640c 100755
--- a/demo/js/mapStyles.js
+++ b/demo/js/mapStyles.js
@@ -13,7 +13,7 @@ const BW_LABEL = 'Black/White'
 
 // Real OS National Grid coverage extent [minX, minY, maxX, maxY], EPSG:27700 — captured from
 // OS's own VTS capabilities response (matches the TILE_GRID_ORIGIN corner already baked into
-// providers/beta/openlayers/src/defaults.js). Used to stop the raster styles below requesting
+// providers/openlayers/src/defaults.js). Used to stop the raster styles below requesting
 // tiles for areas OS has no coverage for.
 const OS_NATIONAL_GRID_EXTENT_27700 = [-238375, 0, 700000, 1300000]
 
diff --git a/demo/js/ml-datasets.js b/demo/js/ml-datasets.js
index 34c827756..163f594c3 100644
--- a/demo/js/ml-datasets.js
+++ b/demo/js/ml-datasets.js
@@ -4,15 +4,15 @@ import { parcelSearch, gridRefSearchETRS89 } from './searchCustomDatasets.js'
 import { transformGeocodeRequest, transformVtsRequest3857, transformDataRequest } from './auth.js'
 // Providers
 import maplibreProvider from '/providers/maplibre/src/index.js'
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
 // Plugins
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
 import createDatasetsPlugin from '/plugins/datasets/src/index.js'
 import createMapKeyPlugin from '/plugins/map-key/src/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
-import createFramePlugin from '/plugins/beta/frame/src/index.js'
+import createFramePlugin from '/plugins/frame/src/index.js'
 
 const pointData = {
   type: 'FeatureCollection',
diff --git a/demo/js/planning-ol.js b/demo/js/planning-ol.js
index 51ad6deb7..30815d23f 100644
--- a/demo/js/planning-ol.js
+++ b/demo/js/planning-ol.js
@@ -1,11 +1,11 @@
 import InteractiveMap from '../../src/index.js'
 // Providers
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
-import openLayersProvider from '/providers/beta/openlayers/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
+import openLayersProvider from '/providers/openlayers/src/index.js'
 // Plugins
-import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import useLocationPlugin from '/plugins/use-location/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
 // Demo utils
diff --git a/demo/js/planning.js b/demo/js/planning.js
index 19fc03233..097d33dc5 100755
--- a/demo/js/planning.js
+++ b/demo/js/planning.js
@@ -1,23 +1,23 @@
 // CSS
 // import '../../dist/css/index.css'
-// import '/plugins/beta/map-styles/dist/css/index.css'
-// import '/plugins/beta/scale-bar/dist/css/index.css'
+// import '/plugins/map-styles/dist/css/index.css'
+// import '/plugins/scale-bar/dist/css/index.css'
 // import '/plugins/search/dist/css/index.css'
 // import '/plugins/interact/dist/css/index.css'
-// import '/plugins/beta/frame/dist/css/index.css'
+// import '/plugins/frame/dist/css/index.css'
 // InteractiveMap
 import InteractiveMap from '../../src/index.js'
 // Providers
-import openNamesProvider from '/providers/beta/open-names/src/index.js'
-import esriProvider from '/providers/beta/esri/src/index.js'
+import openNamesProvider from '/providers/open-names/src/index.js'
+import esriProvider from '/providers/esri/src/index.js'
 // Plugins
-import useLocationPlugin from '/plugins/beta/use-location/src/index.js'
-import mapStylesPlugin from '/plugins/beta/map-styles/src/index.js'
-import createDrawPlugin from '/plugins/beta/draw-es/src/index.js'
-import scaleBarPlugin from '/plugins/beta/scale-bar/src/index.js'
+import useLocationPlugin from '/plugins/use-location/src/index.js'
+import mapStylesPlugin from '/plugins/map-styles/src/index.js'
+import createDrawPlugin from '/plugins/draw-es/src/index.js'
+import scaleBarPlugin from '/plugins/scale-bar/src/index.js'
 import searchPlugin from '/plugins/search/src/index.js'
 import createInteractPlugin from '/plugins/interact/src/index.js'
-import createFramePlugin from '/plugins/beta/frame/src/index.js'
+import createFramePlugin from '/plugins/frame/src/index.js'
 // Demo utils
 import { vtsMapStyles27700 } from './mapStyles.js'
 import { gridRefSearchOSGB36 } from './searchCustomDatasets.js'
diff --git a/demo/js/planning/drawPlugin.js b/demo/js/planning/drawPlugin.js
index 12975081e..14de4527c 100644
--- a/demo/js/planning/drawPlugin.js
+++ b/demo/js/planning/drawPlugin.js
@@ -1,5 +1,5 @@
-import createDrawPlugin from '/plugins/beta/draw-es/src/index.js';
-import createFramePlugin from '/plugins/beta/frame/src/index.js'
+import createDrawPlugin from '/plugins/draw-es/src/index.js';
+import createFramePlugin from '/plugins/frame/src/index.js'
 import { SiteBoundary, siteBoundary } from './siteBoundary.js'
 import { terms } from './terms.js'
 
diff --git a/docs/architecture/interactive-map.likec4 b/docs/architecture/interactive-map.likec4
index a495bcb37..e2cef6ebd 100644
--- a/docs/architecture/interactive-map.likec4
+++ b/docs/architecture/interactive-map.likec4
@@ -102,9 +102,9 @@ model {
   }
 
   // Available Plugins (optional, consumer chooses which to include)
-  drawMl = plugin 'Draw Plugin (MapLibre)' {
+  draw = plugin 'Draw Plugin' {
     description 'Polygon, line, point drawing tools'
-    technology '@defra/im-draw-ml-plugin'
+    technology '@defra/im-draw-plugin'
   }
 
   drawEs = plugin 'Draw Plugin (Esri)' {
@@ -157,7 +157,7 @@ model {
   interactiveMap.entryPoint -> esri 'dynamically loads'
 
   // Plugins loaded by plugin system
-  interactiveMap.pluginSystem -> drawMl 'loads'
+  interactiveMap.pluginSystem -> draw 'loads'
   interactiveMap.pluginSystem -> drawEs 'loads'
   interactiveMap.pluginSystem -> datasets 'loads'
   interactiveMap.pluginSystem -> search 'loads'
@@ -202,7 +202,7 @@ views {
     description 'Optional plugins that can be included by consumers'
 
     include interactiveMap.pluginSystem
-    include drawMl
+    include draw
     include drawEs
     include datasets
     include search
diff --git a/govuk-prototype-kit.config.json b/govuk-prototype-kit.config.json
index 32227673a..c4beb1a22 100644
--- a/govuk-prototype-kit.config.json
+++ b/govuk-prototype-kit.config.json
@@ -64,15 +64,14 @@
     "/plugins/interact/dist",
     "/plugins/search/dist",
     "/plugins/draw/dist",
-    "/providers/beta/open-names/dist",
-    "/providers/beta/openlayers/dist",
+    "/providers/open-names/dist",
+    "/providers/openlayers/dist",
     "/plugins/datasets/dist",
     "/plugins/map-key/dist",
     "/plugins/menu/dist",
-    "/plugins/beta/map-styles/dist",
-    "/plugins/beta/scale-bar/dist",
-    "/plugins/beta/use-location/dist",
-    "/plugins/beta/draw-ml/dist",
-    "/plugins/beta/frame/dist"
+    "/plugins/map-styles/dist",
+    "/plugins/scale-bar/dist",
+    "/plugins/use-location/dist",
+    "/plugins/frame/dist"
   ]
 }
\ No newline at end of file
diff --git a/jest.config.mjs b/jest.config.mjs
index 1cb4f1637..d7918f43f 100755
--- a/jest.config.mjs
+++ b/jest.config.mjs
@@ -31,14 +31,14 @@ export default {
       '<rootDir>/demo',
       '<rootDir>/src/test-utils.js',
       '__helpers__',
-      '<rootDir>/providers/beta/',
-      '<rootDir>/plugins/beta/draw-es',
-      '<rootDir>/plugins/beta/draw-ml',
-      '<rootDir>/plugins/beta/draw-ol',
-      '<rootDir>/plugins/beta/frame',
-      '<rootDir>/plugins/beta/map-styles',
-      '<rootDir>/plugins/beta/scale-bar',
-      '<rootDir>/plugins/beta/use-location',
+      '<rootDir>/providers/esri',
+      '<rootDir>/providers/open-names',
+      '<rootDir>/providers/openlayers',
+      '<rootDir>/plugins/draw-es',
+      '<rootDir>/plugins/frame',
+      '<rootDir>/plugins/map-styles',
+      '<rootDir>/plugins/scale-bar',
+      '<rootDir>/plugins/use-location',
       '<rootDir>/.docusaurus',
       '<rootDir>/build/assets/js',
       '/dist/'
diff --git a/package.json b/package.json
index 799ad919e..7d5860f5e 100755
--- a/package.json
+++ b/package.json
@@ -18,23 +18,23 @@
       "require": "./providers/maplibre/dist/umd/index.js"
     },
     "./providers/open-names": {
-      "import": "./providers/beta/open-names/dist/esm/index.js",
-      "require": "./providers/beta/open-names/dist/umd/index.js"
+      "import": "./providers/open-names/dist/esm/index.js",
+      "require": "./providers/open-names/dist/umd/index.js"
     },
     "./providers/esri": {
-      "import": "./providers/beta/esri/dist/esm/index.js"
+      "import": "./providers/esri/dist/esm/index.js"
     },
     "./providers/openlayers": {
-      "import": "./providers/beta/openlayers/dist/esm/index.js",
-      "require": "./providers/beta/openlayers/dist/umd/index.js"
+      "import": "./providers/openlayers/dist/esm/index.js",
+      "require": "./providers/openlayers/dist/umd/index.js"
     },
     "./plugins/scale-bar": {
-      "import": "./plugins/beta/scale-bar/dist/esm/index.js",
-      "require": "./plugins/beta/scale-bar/dist/umd/index.js"
+      "import": "./plugins/scale-bar/dist/esm/index.js",
+      "require": "./plugins/scale-bar/dist/umd/index.js"
     },
     "./plugins/use-location": {
-      "import": "./plugins/beta/use-location/dist/esm/index.js",
-      "require": "./plugins/beta/use-location/dist/umd/index.js"
+      "import": "./plugins/use-location/dist/esm/index.js",
+      "require": "./plugins/use-location/dist/umd/index.js"
     },
     "./plugins/search": {
       "import": "./plugins/search/dist/esm/index.js",
@@ -54,34 +54,30 @@
       "import": "./plugins/map-key/dist/esm/index.js"
     },
     "./plugins/map-styles": {
-      "import": "./plugins/beta/map-styles/dist/esm/index.js",
-      "require": "./plugins/beta/map-styles/dist/umd/index.js"
-    },
-    "./plugins/draw-ml": {
-      "import": "./plugins/beta/draw-ml/dist/esm/index.js",
-      "require": "./plugins/beta/draw-ml/dist/umd/index.js"
+      "import": "./plugins/map-styles/dist/esm/index.js",
+      "require": "./plugins/map-styles/dist/umd/index.js"
     },
     "./plugins/draw-es": {
-      "import": "./plugins/beta/draw-es/dist/esm/index.js"
+      "import": "./plugins/draw-es/dist/esm/index.js"
     },
     "./plugins/draw": {
       "import": "./plugins/draw/dist/esm/index.js",
       "require": "./plugins/draw/dist/umd/index.js"
     },
     "./plugins/frame": {
-      "import": "./plugins/beta/frame/dist/esm/index.js",
-      "require": "./plugins/beta/frame/dist/umd/index.js"
+      "import": "./plugins/frame/dist/esm/index.js",
+      "require": "./plugins/frame/dist/umd/index.js"
     },
     "./css": "./dist/css/index.css",
     "./plugins/draw/css": "./plugins/draw/dist/css/index.css",
-    "./plugins/scale-bar/css": "./plugins/beta/scale-bar/dist/css/index.css",
+    "./plugins/scale-bar/css": "./plugins/scale-bar/dist/css/index.css",
     "./plugins/datasets/css": "./plugins/datasets/dist/css/index.css",
     "./plugins/menu/css": "./plugins/menu/dist/css/index.css",
     "./plugins/map-key/css": "./plugins/map-key/dist/css/index.css",
-    "./plugins/frame/css": "./plugins/beta/frame/dist/css/index.css",
-    "./plugins/map-styles/css": "./plugins/beta/map-styles/dist/css/index.css",
+    "./plugins/frame/css": "./plugins/frame/dist/css/index.css",
+    "./plugins/map-styles/css": "./plugins/map-styles/dist/css/index.css",
     "./plugins/search/css": "./plugins/search/dist/css/index.css",
-    "./providers/esri/css": "./providers/beta/esri/dist/css/index.css"
+    "./providers/esri/css": "./providers/esri/dist/css/index.css"
   },
   "type": "module",
   "sideEffects": [
diff --git a/plugins/beta/draw-ml/src/DrawInit.jsx b/plugins/beta/draw-ml/src/DrawInit.jsx
deleted file mode 100755
index 22a4a129f..000000000
--- a/plugins/beta/draw-ml/src/DrawInit.jsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useEffect } from 'react'
-import { EVENTS } from '../../../../src/config/events.js'
-import { attachEvents } from './events.js'
-import { createMapboxDraw } from './mapboxDraw.js'
-
-export const DrawInit = ({ appState, appConfig, mapState, pluginConfig, pluginState, services, mapProvider, buttonConfig }) => {
-  const { eventBus } = services
-  const { crossHair } = mapState
-  const isTouchOrKeyboard = ['touch', 'keyboard'].includes(appState.interfaceType)
-
-  // Create draw instance once
-  useEffect(() => {
-    if (!mapState.isMapReady) {
-      return
-    }
-
-    const { remove } = createMapboxDraw({
-      mapStyle: mapState.mapStyle,
-      snapLayers: pluginConfig.snapLayers,
-      mapProvider,
-      events: EVENTS,
-      eventBus
-    })
-
-    // Initialize snap layers flag from config
-    pluginState.dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: pluginConfig.snapLayers?.length > 0 })
-
-    // Draw ready
-    eventBus.emit('draw:ready')
-
-    return () => remove()
-  }, [mapState.isMapReady])
-
-  // Keep draw instance aware of the crossHair API so draw modes can use show/hide
-  // (rather than direct DOM manipulation which conflicts with React's controlled display style)
-  useEffect(() => {
-    if (mapProvider.draw) {
-      mapProvider.draw._crossHair = crossHair
-    }
-  }, [mapProvider.draw, crossHair])
-
-  // Show crosshair immediately on touch/keyboard when entering draw mode
-  useEffect(() => {
-    if (['draw_polygon', 'draw_line'].includes(pluginState.mode) && isTouchOrKeyboard) {
-      const wasAlreadyVisible = crossHair.isVisible
-      crossHair.fixAtCenter()
-      return () => {
-        if (!wasAlreadyVisible) {
-          crossHair.hide()
-        }
-      }
-    }
-  }, [pluginState.mode, appState.interfaceType])
-
-  // Keep edit mode in sync with the global interface type so the touch
-  // offset target shows/hides immediately when the input device changes
-  // (e.g. switching between stylus/touch and mouse on a Surface tablet).
-  useEffect(() => {
-    if (pluginState.mode !== 'edit_vertex' || !mapProvider.map) {
-      return undefined
-    }
-    mapProvider.map.fire('draw.interfacetypechange', { interfaceType: appState.interfaceType })
-    return undefined
-  }, [appState.interfaceType, pluginState.mode])
-
-  // Attach events when plgin state changes
-  useEffect(() => {
-    if (!mapProvider.draw) {
-      return
-    }
-
-    const cleanupEvents = attachEvents({
-      appState,
-      appConfig,
-      mapState,
-      mapProvider,
-      buttonConfig,
-      pluginState,
-      events: EVENTS,
-      eventBus
-    })
-
-    return () => cleanupEvents()
-  }, [mapProvider, appState, pluginState])
-}
diff --git a/plugins/beta/draw-ml/src/api/addFeature.js b/plugins/beta/draw-ml/src/api/addFeature.js
deleted file mode 100644
index 6d2a9122b..000000000
--- a/plugins/beta/draw-ml/src/api/addFeature.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import { flattenStyleProperties } from '../utils/flattenStyleProperties.js'
-
-export const addFeature = ({ mapProvider, services }, feature) => {
-  const { draw } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return
-  }
-
-  // Extract style props from top level, flatten variants, merge with custom properties
-  const { stroke, fill, strokeWidth, properties, ...rest } = feature
-  const flatFeature = {
-    ...rest,
-    properties: {
-      ...properties,
-      ...flattenStyleProperties({ stroke, fill, strokeWidth })
-    }
-  }
-
-  // --- Add feature to draw instance
-  draw.add(flatFeature, {
-    userProperties: true
-  })
-
-  eventBus.emit('draw:add', flatFeature)
-}
diff --git a/plugins/beta/draw-ml/src/api/deleteFeature.js b/plugins/beta/draw-ml/src/api/deleteFeature.js
deleted file mode 100644
index faa97f1a7..000000000
--- a/plugins/beta/draw-ml/src/api/deleteFeature.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const deleteFeature = ({ mapProvider, services }, featureIds) => {
-  const { draw } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return
-  }
-
-  // --- Delete features from draw instance
-  draw.delete(featureIds)
-
-  eventBus.emit('draw:delete', { featureIds })
-}
diff --git a/plugins/beta/draw-ml/src/api/editFeature.js b/plugins/beta/draw-ml/src/api/editFeature.js
deleted file mode 100644
index da1dfadb5..000000000
--- a/plugins/beta/draw-ml/src/api/editFeature.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import { getSnapInstance } from '../utils/snapHelpers.js'
-
-/**
- * Programmatically edit a feature
- * @param {object} context - plugin context
- * @param {string} featureId - ID of the feature to edit
- * @param {object} options - Options including snapLayers
- */
-export const editFeature = ({ appState, appConfig, mapState, pluginConfig, pluginState, mapProvider, services }, featureId, options = {}) => {
-  const { dispatch } = pluginState
-  const { draw, map } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return false
-  }
-
-  // Guard: feature must exist in draw before doing anything
-  const existingFeature = draw.get(featureId)
-  if (!existingFeature) {
-    return false
-  }
-
-  const editModeMap = { LineString: 'edit_line', Polygon: 'edit_polygon' }
-  eventBus.emit('draw:editstart', { mode: editModeMap[existingFeature.geometry.type] })
-
-  // Determin snapLayers from pluginConfig or runtime config
-  let snapLayers = null
-  if (options.snapLayers === undefined) {
-    snapLayers = pluginConfig.snapLayers ?? null
-  } else {
-    snapLayers = options.snapLayers
-  }
-
-  // Set per-call snap layers if provided
-  const snap = getSnapInstance(map)
-  if (snap?.setSnapLayers) {
-    snap.setSnapLayers(snapLayers)
-  } else if (snapLayers) {
-    // Snap instance not ready yet - store for later
-    map._pendingSnapLayers = snapLayers
-  } else {
-    // No action
-  }
-
-  // Update state so UI can react to snap layer availability
-  dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: snapLayers?.length > 0 })
-
-  // Change mode to edit_vertex
-  draw.changeMode('edit_vertex', {
-    container: appState.layoutRefs.viewportRef.current,
-    deleteVertexButtonId: `${appConfig.id}-draw-delete-point`,
-    undoButtonId: `${appConfig.id}-draw-undo`,
-    isPanEnabled: appState.interfaceType !== 'keyboard',
-    interfaceType: appState.interfaceType,
-    scale: { small: 1, medium: 1.5, large: 2 }[mapState.mapSize],
-    featureId,
-    getSnapEnabled: () => mapProvider.snapEnabled === true
-  })
-
-  // Put feature in state
-  const feature = draw.get(featureId)
-  dispatch({
-    type: 'SET_FEATURE',
-    payload: {
-      feature,
-      tempFeature: feature
-    }
-  })
-
-  // Set mode to edit_vertex
-  dispatch({ type: 'SET_MODE', payload: 'edit_vertex' })
-
-  return true
-}
diff --git a/plugins/beta/draw-ml/src/api/merge.js b/plugins/beta/draw-ml/src/api/merge.js
deleted file mode 100644
index 9a2fa9d2d..000000000
--- a/plugins/beta/draw-ml/src/api/merge.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Programmatically merge multiple polygons ia single polygon
- * @param {object} context - plugin context
- * @param {string} polygon[] - an a rray of polygons to merge
- */
-export const merge = ({ services }, polygons) => {
-  console.log('merge')
-  console.log(polygons)
-}
diff --git a/plugins/beta/draw-ml/src/api/newLine.js b/plugins/beta/draw-ml/src/api/newLine.js
deleted file mode 100644
index 573faef21..000000000
--- a/plugins/beta/draw-ml/src/api/newLine.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { getSnapInstance } from '../utils/snapHelpers.js'
-import { flattenStyleProperties } from '../utils/flattenStyleProperties.js'
-
-/**
- * Programmatically create a new line
- * @param {object} context - plugin context
- * @param {string} featureId - ID for the new feature
- * @param {object} options - Options including snapLayers, stroke, fill, strokeWidth, properties.
- */
-export const newLine = ({ appState, appConfig, pluginConfig, pluginState, mapProvider, services }, featureId, options = {}) => {
-  const { dispatch } = pluginState
-  const { draw, map } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return
-  }
-
-  // Emit draw:started
-  eventBus.emit('draw:started', { mode: 'draw_line' })
-
-  // Determin snapLayers from pluginConfig or runtime config
-  let snapLayers = null
-  if (options.snapLayers !== undefined) {
-    snapLayers = options.snapLayers
-  } else if (pluginConfig.snapLayers !== undefined) {
-    snapLayers = pluginConfig.snapLayers
-  } else {
-    snapLayers = null
-  }
-
-  // Set per-call snap layers if provided
-  const snap = getSnapInstance(map)
-  if (snap?.setSnapLayers) {
-    snap.setSnapLayers(snapLayers)
-  } else if (snapLayers) {
-    // Snap instance not ready yet - store for later
-    map._pendingSnapLayers = snapLayers
-  } else {
-    // No action
-  }
-
-  // Update state so UI can react to snap layer availability
-  dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: snapLayers?.length > 0 })
-
-  // Extract style props and flatten variants into properties
-  const { stroke, fill, strokeWidth, properties: customProperties, ...modeOptions } = options
-  const properties = {
-    ...customProperties,
-    ...flattenStyleProperties({ stroke, fill, strokeWidth })
-  }
-
-  // Change mode to draw_line
-  draw.changeMode('draw_line', {
-    container: appState.layoutRefs.viewportRef.current,
-    vertexMarkerId: `${appConfig.id}-cross-hair`,
-    addVertexButtonId: `${appConfig.id}-draw-add-point`,
-    interfaceType: appState.interfaceType,
-    crossHair: draw._crossHair,
-    getSnapEnabled: () => mapProvider.snapEnabled === true,
-    featureId,
-    ...modeOptions,
-    properties
-  })
-
-  // Set mode to draw_line
-  dispatch({ type: 'SET_MODE', payload: 'draw_line' })
-}
diff --git a/plugins/beta/draw-ml/src/api/newPolygon.js b/plugins/beta/draw-ml/src/api/newPolygon.js
deleted file mode 100644
index e1c961001..000000000
--- a/plugins/beta/draw-ml/src/api/newPolygon.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import { getSnapInstance } from '../utils/snapHelpers.js'
-import { flattenStyleProperties } from '../utils/flattenStyleProperties.js'
-
-/**
- * Programmatically create a new polygon
- * @param {object} context - plugin context
- * @param {string} featureId - ID for the new feature
- * @param {object} options - Options including snapLayers, stroke, fill, strokeWidth, properties.
- */
-export const newPolygon = ({ appState, appConfig, pluginConfig, pluginState, mapProvider, services }, featureId, options = {}) => {
-  const { dispatch } = pluginState
-  const { draw, map } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return
-  }
-
-  // Emit draw:started
-  eventBus.emit('draw:started', { mode: 'draw_polygon' })
-
-  // Determin snapLayers from pluginConfig or runtime config
-  let snapLayers = null
-  if (options.snapLayers !== undefined) {
-    snapLayers = options.snapLayers
-  } else if (pluginConfig.snapLayers !== undefined) {
-    snapLayers = pluginConfig.snapLayers
-  } else {
-    snapLayers = null
-  }
-
-  // Set per-call snap layers if provided
-  const snap = getSnapInstance(map)
-  if (snap?.setSnapLayers) {
-    snap.setSnapLayers(snapLayers)
-  } else if (snapLayers) {
-    // Snap instance not ready yet - store for later
-    map._pendingSnapLayers = snapLayers
-  } else {
-    // No action
-  }
-
-  // Update state so UI can react to snap layer availability
-  dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: snapLayers?.length > 0 })
-
-  // Extract style props and flatten variants into properties
-  const { stroke, fill, strokeWidth, properties: customProperties, ...modeOptions } = options
-  const properties = {
-    ...customProperties,
-    ...flattenStyleProperties({ stroke, fill, strokeWidth })
-  }
-
-  // Change mode to draw_polygon
-  draw.changeMode('draw_polygon', {
-    container: appState.layoutRefs.viewportRef.current,
-    vertexMarkerId: `${appConfig.id}-cross-hair`,
-    addVertexButtonId: `${appConfig.id}-draw-add-point`,
-    interfaceType: appState.interfaceType,
-    crossHair: draw._crossHair,
-    getSnapEnabled: () => mapProvider.snapEnabled === true,
-    featureId,
-    ...modeOptions,
-    properties
-  })
-
-  // Set mode to draw_polygon
-  dispatch({ type: 'SET_MODE', payload: 'draw_polygon' })
-}
diff --git a/plugins/beta/draw-ml/src/api/split.js b/plugins/beta/draw-ml/src/api/split.js
deleted file mode 100644
index 607bee185..000000000
--- a/plugins/beta/draw-ml/src/api/split.js
+++ /dev/null
@@ -1,81 +0,0 @@
-import { getSnapInstance } from '../utils/snapHelpers.js'
-import { splitPolygon } from '../utils/spatial.js'
-import { debounce } from '../utils/debounce.js'
-
-/**
- * Programmatically split a polygon or line
- * @param {object} context - plugin context
- * @param {string} feature - the new feature to be split
- * @param {object} options - Options including snapLayers.
- */
-export const split = ({ appState, appConfig, pluginState, mapProvider }, featureId, options = {}) => {
-  const { dispatch } = pluginState
-  const { draw, map } = mapProvider
-
-  if (!draw) {
-    return
-  }
-
-  // Get target polygon feature
-  const polygonFeature = draw.get(featureId)
-
-  // Always include 'stroke-inactive' in snap layers
-  const snapLayers = ['stroke-inactive.cold', ...(options.snapLayers || [])]
-
-  // Set per-call snap layers if provided
-  const snap = getSnapInstance(map)
-
-  if (snap?.setSnapLayers) {
-    snap.setSnapLayers(snapLayers)
-  } else if (options.snapLayers) {
-    // Snap instance not ready yet - store for later
-    map._pendingSnapLayers = snapLayers
-  } else {
-    // No action
-  }
-
-  // Update state so UI can react to snap layer availability
-  dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: true })
-
-  // Change mode to draw_line
-  draw.changeMode('draw_line', {
-    container: appState.layoutRefs.viewportRef.current,
-    vertexMarkerId: `${appConfig.id}-cross-hair`,
-    addVertexButtonId: `${appConfig.id}-draw-add-point`,
-    interfaceType: appState.interfaceType,
-    getSnapEnabled: () => mapProvider.snapEnabled === true,
-    featureId: '_splitter',
-    properties: { splitter: 'invalid' }
-  })
-
-  // Perform split
-  map.on('draw.create', (e) => {
-    const lineFeature = e.features[0]
-    const featureCollection = splitPolygon(polygonFeature, lineFeature)
-    draw.setFeatureProperty('_splitter', 'splitter', featureCollection ? 'valid' : 'invalid')
-    dispatch({ type: 'SET_ACTION', payload: { name: 'split', isValid: !!featureCollection } })
-  })
-
-  // Real time check for valid line
-  const DEBOUNCE_SPLIT_POLYGON = 50
-  const onGeometryChange = debounce((e) => {
-    if (e.coordinates.length < 2) {
-      return
-    }
-    const lineFeature = { id: '_splitter', geometry: { type: 'LineString', coordinates: e.coordinates } }
-    const featureCollection = splitPolygon(polygonFeature, lineFeature)
-    const isValid = !!featureCollection
-    e.properties.splitter = isValid ? 'valid' : 'invalid'
-    e.ctx.store.render()
-    if (draw.getMode() === 'edit_vertex') {
-      dispatch({ type: 'SET_ACTION', payload: { name: 'split', isValid } })
-    }
-  }, DEBOUNCE_SPLIT_POLYGON)
-  map.on('draw.geometrychange', onGeometryChange)
-
-  // Set mode to 'draw_line'
-  dispatch({ type: 'SET_MODE', payload: 'draw_line' })
-
-  // Set action to 'split'
-  dispatch({ type: 'SET_ACTION', payload: { name: 'split' } })
-}
diff --git a/plugins/beta/draw-ml/src/defaults.js b/plugins/beta/draw-ml/src/defaults.js
deleted file mode 100644
index 27dbab318..000000000
--- a/plugins/beta/draw-ml/src/defaults.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const DEFAULTS = {
-  editStroke: { light: 'rgba(29,112,184,1)', dark: '#ffffff' },
-  editVertex: { light: 'rgba(29,112,184,1)', dark: '#ffffff' },
-  editMidpoint: { light: 'rgba(29,112,184,1)', dark: '#ffffff' },
-  editHalo: { light: '#ffffff', dark: 'rgba(11,12,12,1)' },
-  editActive: { light: 'rgba(11,12,12,1)', dark: '#ffffff' },
-  splitInvalid: { light: 'rgba(29,112,184,1)', dark: 'rgba(29,112,184,1)' },
-  splitValid: { light: 'rgba(29,112,184,1)', dark: 'rgba(29,112,184,1)' },
-  shapeStroke: 'rgba(212,53,28,1)',
-  shapeFill: 'rgba(212,53,28,0.1)',
-  strokeWidth: 2,
-  snapVertex: 'rgba(212,53,28,1)',
-  snapMidpoint: 'rgba(40,161,151,1)',
-  snapEdge: 'rgba(29,112,184,1)',
-  snapRadius: 10,
-  snapLayers: []
-}
diff --git a/plugins/beta/draw-ml/src/draw.scss b/plugins/beta/draw-ml/src/draw.scss
deleted file mode 100755
index a2bd6639c..000000000
--- a/plugins/beta/draw-ml/src/draw.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-// Maplibre custom mode
-.touch-vertex-target {
-    circle {
-        fill: var(--map-overlay-foreground-color);
-    }
-    path {
-        fill: var(--map-overlay-halo-color);
-    }
-}
-
-// Ensure action buttons take up same width
-.im-c-actions {
-    .im-c-button-wrapper--draw-done,
-    .im-c-button-wrapper--draw-menu,
-    .im-c-button-wrapper--draw-cancel {
-        width: 33.33%;
-    }
-}
-.im-o-app--tablet .im-c-actions,
-.im-o-app--desktop .im-c-actions {
-    .im-c-button-wrapper--draw-done,
-    .im-c-button-wrapper--draw-menu,
-    .im-c-button-wrapper--draw-cancel {
-        width: 100px;
-    }
-}
diff --git a/plugins/beta/draw-ml/src/events.js b/plugins/beta/draw-ml/src/events.js
deleted file mode 100755
index c1a2a3b51..000000000
--- a/plugins/beta/draw-ml/src/events.js
+++ /dev/null
@@ -1,185 +0,0 @@
-import { clearSnapState, clearSnapIndicator, getSnapInstance } from './utils/snapHelpers.js'
-
-export function attachEvents ({ pluginState, mapProvider, buttonConfig, eventBus }) {
-  const { drawDone, drawAddPoint, drawUndo, drawDeletePoint, drawSnap, drawCancel } = buttonConfig
-  const { map, draw } = mapProvider
-  const { dispatch, feature, tempFeature } = pluginState
-
-  // --- Helper to disable snap
-  const disableSnap = () => {
-    mapProvider.snapEnabled = false
-    dispatch({ type: 'SET_SNAP', payload: false })
-    const snap = getSnapInstance(map)
-    if (snap) {
-      snap.setSnapStatus?.(false)
-      clearSnapState(snap)
-    }
-    if (map.getLayer('snap-helper-circle')) {
-      map.setLayoutProperty('snap-helper-circle', 'visibility', 'none')
-    }
-  }
-
-  // --- Helper to reset draw mode and feature (without touching snap)
-  const resetDrawModeAndFeature = () => {
-    mapProvider.undoStack?.clear()
-    dispatch({ type: 'SET_MODE', payload: null })
-    dispatch({ type: 'SET_FEATURE', payload: { feature: null, tempFeature: null } })
-  }
-
-  // --- Button handlers
-  const handleDone = () => {
-    const mode = draw.getMode()
-
-    disableSnap()
-    mapProvider.undoStack?.clear()
-
-    if (mode === 'edit_vertex') {
-      map.fire('draw.editfinish', { features: [draw.get(tempFeature.id)] })
-      return
-    }
-
-    if (!['draw_polygon', 'draw_line'].includes(mode)) {
-      return
-    }
-
-    // Trigger onStop → ParentMode.onStop, which strips the rubber-band vertex
-    // and fires draw.create once with the correct geometry.
-    draw.changeMode('disabled')
-  }
-
-  const handleCancel = () => {
-    draw.trash()
-    if (tempFeature?.id) {
-      draw.delete(tempFeature.id)
-    }
-    if (feature) {
-      draw.add(feature)
-    }
-    disableSnap()
-    draw.changeMode('disabled')
-    resetDrawModeAndFeature()
-    eventBus.emit('draw:cancelled', feature)
-  }
-
-  const handleUndo = () => {
-    if (draw.getMode() === 'edit_vertex') {
-      return
-    }
-    const undoStack = mapProvider.undoStack
-    if (!undoStack?.length) {
-      return
-    }
-    const operation = undoStack.pop()
-    map._undoInProgress = true
-    setTimeout(() => { map._undoInProgress = false }, 100)
-    map.fire('draw.undo', { operation })
-  }
-
-  let lastToggleTime = 0
-  const THROTTLE_MS = 300
-  const handleSnap = () => {
-    const now = Date.now()
-    if (now - lastToggleTime < THROTTLE_MS) {
-      return
-    }
-    lastToggleTime = now
-
-    const newSnapState = !pluginState.snap
-    dispatch({ type: 'TOGGLE_SNAP' })
-    mapProvider.snapEnabled = newSnapState
-
-    const snap = getSnapInstance(map)
-    if (snap?.setSnapStatus) {
-      snap.setSnapStatus(newSnapState)
-    }
-
-    if (!newSnapState && snap) {
-      clearSnapState(snap)
-      if (map.getLayer('snap-helper-circle')) {
-        map.setLayoutProperty('snap-helper-circle', 'visibility', 'none')
-      }
-    }
-  }
-
-  // --- Ensure snap indicator is hidden whenever not in a drawing mode
-  const DRAWING_MODES = ['draw_polygon', 'draw_line']
-  const handleModeChange = (e) => {
-    if (!DRAWING_MODES.includes(e.mode)) {
-      const snap = getSnapInstance(map)
-      clearSnapIndicator(snap, map)
-    }
-  }
-
-  // --- Map style update
-  const handleStyleData = () => {
-    const layers = map.getStyle().layers || []
-    if (!layers.length || layers[layers.length - 1].source?.startsWith('mapbox-gl-draw')) {
-      return
-    }
-    layers.filter(l => l.source?.startsWith('mapbox-gl-draw')).forEach(l => map.moveLayer(l.id))
-  }
-
-  // --- Draw completion handlers (create / edit)
-  const handleDrawCompletion = (eventName) => (e) => {
-    const newFeature = e.features[0]
-    disableSnap()
-    resetDrawModeAndFeature()
-    setTimeout(() => draw.changeMode('disabled'), 0)
-    eventBus.emit(eventName, newFeature)
-  }
-
-  // --- Draw update handler
-  const handleUpdate = (e) => {
-    const tempFeature = e.features[0]
-    eventBus.emit('draw:updated', tempFeature)
-  }
-
-  const onCreate = handleDrawCompletion('draw:created')
-  const onEditFinish = handleDrawCompletion('draw:edited')
-
-  // --- Other map events
-  const onVertexSelection = (e) => {
-    dispatch({ type: 'SET_SELECTED_VERTEX_INDEX', payload: e })
-    eventBus.emit('draw:vertexselection', e)
-  }
-  const onVertexChange = (e) => {
-    dispatch({ type: 'SET_SELECTED_VERTEX_INDEX', payload: { index: -1, numVertecies: e.numVertecies } })
-  }
-  const onUndoChange = (e) => {
-    dispatch({ type: 'SET_UNDO_STACK_LENGTH', payload: e.length })
-  }
-
-  // --- Register events
-  drawDone.onClick = handleDone
-  drawCancel.onClick = handleCancel
-  drawUndo.onClick = handleUndo
-  drawSnap.onClick = handleSnap
-
-  map.on('styledata', handleStyleData)
-  map.on('draw.cancel', handleCancel)
-  map.on('draw.create', onCreate)
-  map.on('draw.modechange', handleModeChange)
-  map.on('draw.editfinish', onEditFinish)
-  map.on('draw.update', handleUpdate)
-  map.on('draw.vertexselection', onVertexSelection)
-  map.on('draw.vertexchange', onVertexChange)
-  map.on('draw.undochange', onUndoChange)
-
-  // --- Cleanup
-  return () => {
-    [drawDone, drawAddPoint, drawUndo, drawDeletePoint, drawSnap, drawCancel].forEach(btn => {
-      if (btn) {
-        btn.onClick = null
-      }
-    })
-    map.off('styledata', handleStyleData)
-    map.off('draw.cancel', handleCancel)
-    map.off('draw.create', onCreate)
-    map.off('draw.editfinish', onEditFinish)
-    map.off('draw.update', handleUpdate)
-    map.off('draw.modechange', handleModeChange)
-    map.off('draw.vertexselection', onVertexSelection)
-    map.off('draw.vertexchange', onVertexChange)
-    map.off('draw.undochange', onUndoChange)
-  }
-}
diff --git a/plugins/beta/draw-ml/src/index.js b/plugins/beta/draw-ml/src/index.js
deleted file mode 100755
index 272bfe8f1..000000000
--- a/plugins/beta/draw-ml/src/index.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// /plugins/draw-ml/index.js
-// import './draw.scss'
-
-export default function createPlugin (options = {}) {
-  return {
-    ...options,
-    id: 'draw',
-    load: async () => {
-      const module = (await import(/* webpackChunkName: "im-draw-ml-plugin" */ './manifest.js')).manifest
-      return module
-    }
-  }
-}
diff --git a/plugins/beta/draw-ml/src/manifest.js b/plugins/beta/draw-ml/src/manifest.js
deleted file mode 100755
index 60a043935..000000000
--- a/plugins/beta/draw-ml/src/manifest.js
+++ /dev/null
@@ -1,110 +0,0 @@
-// /plugins/draw-ml/manifest.js
-import { initialState, actions } from './reducer.js'
-import { DrawInit } from './DrawInit.jsx'
-import { newPolygon } from './api/newPolygon.js'
-import { newLine } from './api/newLine.js'
-import { editFeature } from './api/editFeature.js'
-import { addFeature } from './api/addFeature.js'
-import { deleteFeature } from './api/deleteFeature.js'
-import { split } from './api/split.js'
-import { merge } from './api/merge.js'
-
-const createButtonSlots = (showLabel) => ({
-  mobile: { slot: 'actions', showLabel },
-  tablet: { slot: 'actions', showLabel },
-  desktop: { slot: 'actions', showLabel }
-})
-
-export const manifest = {
-  reducer: {
-    initialState,
-    actions
-  },
-
-  InitComponent: DrawInit,
-
-  buttons: [{
-    id: 'drawCancel',
-    label: 'Cancel',
-    variant: 'tertiary',
-    exclusiveSlot: true,
-    hiddenWhen: ({ pluginState }) => !pluginState.mode,
-    ...createButtonSlots(true)
-  }, {
-    id: 'drawAddPoint',
-    label: 'Add point',
-    variant: 'primary',
-    exclusiveSlot: true,
-    hiddenWhen: ({ appState, pluginState }) => !['draw_polygon', 'draw_line'].includes(pluginState.mode) || appState.interfaceType !== 'touch',
-    ...createButtonSlots(true)
-  }, {
-    id: 'drawDone',
-    label: 'Done',
-    variant: 'primary',
-    exclusiveSlot: true,
-    hiddenWhen: ({ pluginState }) => !['draw_polygon', 'draw_line', 'edit_vertex'].includes(pluginState.mode),
-    enableWhen: ({ pluginState }) => pluginState.numVertecies >= (pluginState.mode === 'draw_polygon' ? 3 : 2),
-    ...createButtonSlots(true)
-  }, {
-    id: 'drawMenu',
-    label: 'Menu',
-    iconId: 'menu',
-    hiddenWhen: ({ pluginState }) => !['draw_polygon', 'draw_line', 'edit_vertex'].includes(pluginState.mode),
-    menuItems: [{
-      id: 'drawUndo',
-      label: 'Undo',
-      iconId: 'undo',
-      hiddenWhen: ({ pluginState }) => !['draw_polygon', 'draw_line', 'edit_vertex'].includes(pluginState.mode),
-      enableWhen: ({ pluginState }) => pluginState.undoStackLength > 0
-    }, {
-      id: 'drawSnap',
-      label: 'Snap to feature',
-      iconId: 'magnet',
-      hiddenWhen: ({ pluginState }) => !pluginState.mode || !pluginState.hasSnapLayers,
-      pressedWhen: ({ pluginState }) => !!pluginState.snap
-    }, {
-      id: 'drawDeletePoint',
-      label: 'Delete point',
-      iconId: 'trash',
-      enableWhen: ({ pluginState }) => pluginState.selectedVertexIndex >= 0 && pluginState.numVertecies > (pluginState.tempFeature?.geometry?.type === 'Polygon' ? 3 : 2),
-      hiddenWhen: ({ pluginState }) => !(['simple_select', 'edit_vertex'].includes(pluginState.mode))
-    }],
-    mobile: { slot: 'bottom-right' },
-    tablet: { slot: 'top-middle' },
-    desktop: { slot: 'top-middle' }
-  }],
-
-  keyboardShortcuts: [{
-    id: 'drawStart',
-    group: 'Drawing',
-    title: 'Edit vertex',
-    command: '<kbd>Spacebar</kbd></dd>'
-  }],
-
-  icons: [{
-    id: 'menu',
-    svgContent: '<path d="m6 9 6 6 6-6"/>'
-  }, {
-    id: 'undo',
-    svgContent: '<path d="M9 14 4 9l5-5"/><path d="M4 9h10.5a5.5 5.5 0 0 1 5.5 5.5a5.5 5.5 0 0 1-5.5 5.5H11"/>'
-  }, {
-    id: 'check',
-    svgContent: '<path d="M20 6 9 17l-5-5"/>'
-  }, {
-    id: 'magnet',
-    svgContent: '<path d="m12 15 4 4"/><path d="M2.352 10.648a1.205 1.205 0 0 0 0 1.704l2.296 2.296a1.205 1.205 0 0 0 1.704 0l6.029-6.029a1 1 0 1 1 3 3l-6.029 6.029a1.205 1.205 0 0 0 0 1.704l2.296 2.296a1.205 1.205 0 0 0 1.704 0l6.365-6.367A1 1 0 0 0 8.716 4.282z"/><path d="m5 8 4 4"/>'
-  }, {
-    id: 'trash',
-    svgContent: '<path d="M10 11v6"/><path d="M14 11v6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M3 6h18"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>'
-  }],
-
-  api: {
-    newPolygon,
-    newLine,
-    editFeature,
-    addFeature,
-    deleteFeature,
-    split,
-    merge
-  }
-}
diff --git a/plugins/beta/draw-ml/src/mapboxDraw.js b/plugins/beta/draw-ml/src/mapboxDraw.js
deleted file mode 100755
index b914249cf..000000000
--- a/plugins/beta/draw-ml/src/mapboxDraw.js
+++ /dev/null
@@ -1,143 +0,0 @@
-import MapboxDraw from '@mapbox/mapbox-gl-draw'
-import { DisabledMode } from './modes/disabledMode.js'
-import { EditVertexMode } from './modes/editVertexMode.js'
-import { DrawPolygonMode } from './modes/drawPolygonMode.js'
-import { DrawLineMode } from './modes/drawLineMode.js'
-import { createDrawStyles, updateDrawStyles } from './styles.js'
-import { initMapLibreSnap } from './mapboxSnap.js'
-import { createUndoStack } from './undoStack.js'
-import { applyTouchVertexColors } from './modes/editVertex/touchHandlers.js'
-
-/**
- * Creates and manages a MapLibre/Mapbox Draw control instance configured for polygon editing.
- * Returns an object with a `.remove()` cleanup function that removes all listeners
- * and safely disposes of the Draw control.
- *
- * Features:
- * - Custom modes for editing and drawing vertices
- * - Dynamic runtime style updates on `events.MAP_SET_STYLE` event
- * - Safe reapplication of styles if map.setStyle is called
- *
- * @param {string} options.mapStyle - Map style object
- * @param {Object} options.mapProvider - Object containing the map instance
- * @param {Object} options.eventBus - Event bus for app-level events
- * @returns {{ draw: MapboxDraw, remove: Function }} draw instance and cleanup function
- */
-export const createMapboxDraw = ({ mapStyle, mapProvider, events, eventBus, snapLayers }) => {
-  const { map } = mapProvider
-
-  // --- Configure MapLibre GL Draw CSS classes ---
-  MapboxDraw.constants.classes.CONTROL_BASE = 'maplibregl-ctrl'
-  MapboxDraw.constants.classes.CONTROL_PREFIX = 'maplibregl-ctrl-'
-  MapboxDraw.constants.classes.CONTROL_GROUP = 'maplibregl-ctrl-group'
-
-  // --- Register custom modes ---
-  const modes = {
-    ...MapboxDraw.modes,
-    disabled: DisabledMode,
-    edit_vertex: EditVertexMode,
-    draw_polygon: DrawPolygonMode,
-    draw_line: DrawLineMode
-  }
-
-  // --- Create MapLibre Draw instance ---
-  const draw = new MapboxDraw({
-    modes,
-    styles: createDrawStyles(mapStyle),
-    displayControlsDefault: false,
-    userProperties: true,
-    defaultMode: 'disabled'
-  })
-  map.addControl(draw)
-
-  // Workaround: mapbox-gl-draw calls preventDefault() on touchend even in disabled mode,
-  // which prevents the browser from synthesizing a click event. We detect taps and
-  // manually dispatch a click event when in disabled mode.
-  const canvas = map.getCanvas()
-  let touchStart = null
-
-  const handleTouchStart = (e) => {
-    if (e.touches.length === 1) {
-      touchStart = { x: e.touches[0].clientX, y: e.touches[0].clientY, time: Date.now() }
-    }
-  }
-
-  const handleTouchEnd = (e) => {
-    if (draw.getMode() !== 'disabled' || !touchStart) {
-      touchStart = null
-      return
-    }
-
-    const touch = e.changedTouches[0]
-    const dx = touch.clientX - touchStart.x
-    const dy = touch.clientY - touchStart.y
-    const duration = Date.now() - touchStart.time
-
-    // Only synthesize click for quick taps with minimal movement
-    if (duration < 300 && Math.abs(dx) < 10 && Math.abs(dy) < 10) {
-      canvas.dispatchEvent(new MouseEvent('click', {
-        bubbles: true,
-        cancelable: true,
-        clientX: touch.clientX,
-        clientY: touch.clientY
-      }))
-    }
-
-    touchStart = null
-  }
-
-  canvas.addEventListener('touchstart', handleTouchStart, { passive: true })
-  canvas.addEventListener('touchend', handleTouchEnd, { passive: true })
-
-  // We need a reference to this
-  mapProvider.draw = draw
-  map._drawCurrentMapStyle = mapStyle
-  // Initialize snap as disabled (matches initialState.snap = false)
-  mapProvider.snapEnabled = false
-  // Initialize undo stack (also stored on map for mode access)
-  const undoStack = createUndoStack(map)
-  mapProvider.undoStack = undoStack
-  map._undoStack = undoStack
-
-  // --- Initialize MapboxSnap using external module ---
-  // Start with status: false to match initial snap disabled state
-  initMapLibreSnap(map, draw, {
-    layers: snapLayers,
-    radius: 10,
-    rules: ['vertex', 'edge']
-  })
-
-  // --- Update colour scheme ---
-  const handleSetMapStyle = (e) => {
-    map._drawCurrentMapStyle = e
-    map.once('idle', () => {
-      updateDrawStyles(map, e)
-      const svg = map._drawEditContainer?.querySelector('[data-touch-vertex-target]')
-      applyTouchVertexColors(svg, e)
-    })
-  }
-  eventBus.on(events.MAP_SET_STYLE, handleSetMapStyle)
-
-  // --- Update map scale ---
-  const handleSetMapSize = (e) => {
-    map.fire('draw.scalechange', { scale: { small: 1, medium: 1.5, large: 2 }[e] })
-  }
-  eventBus.on(events.MAP_SET_SIZE, handleSetMapSize)
-
-  // --- Return instance and cleanup function ---
-  return {
-    draw,
-    remove () {
-      // Remove touch workaround listeners
-      canvas.removeEventListener('touchstart', handleTouchStart)
-      canvas.removeEventListener('touchend', handleTouchEnd)
-      // Remove event listeners
-      eventBus.off(events.MAP_SET_STYLE, handleSetMapStyle)
-      // Delete all features and disable draw
-      draw.deleteAll()
-      draw.changeMode('disabled')
-      // Remove draw control from map
-      map.removeControl(draw)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ml/src/mapboxSnap.js b/plugins/beta/draw-ml/src/mapboxSnap.js
deleted file mode 100644
index 4f616df74..000000000
--- a/plugins/beta/draw-ml/src/mapboxSnap.js
+++ /dev/null
@@ -1,321 +0,0 @@
-import MapboxSnap from 'mapbox-gl-snap/dist/esm/MapboxSnap.js'
-import { polygon, lineString } from '@turf/helpers'
-import { DEFAULTS } from './defaults.js'
-
-const SNAP_HELPER_LAYER = 'snap-helper-circle'
-
-/** Apply patches to MapboxSnap prototype (once only) */
-function applyMapboxSnapPatches (colors) {
-  if (MapboxSnap.prototype.__snapPatched) {
-    return
-  }
-  MapboxSnap.prototype.__snapPatched = true
-
-  const proto = MapboxSnap.prototype
-  const orig = {
-    setMapData: proto.setMapData,
-    drawingSnapCheck: proto.drawingSnapCheck,
-    getLines: proto.getLines,
-    getCloseFeatures: proto.getCloseFeatures,
-    searchInVertex: proto.searchInVertex,
-    searchInMidPoint: proto.searchInMidPoint,
-    searchInEdge: proto.searchInEdge,
-    snapToClosestPoint: proto.snapToClosestPoint
-  }
-
-  // Disable changeSnappedPoints - we handle snap ourselves in drag handlers
-  proto.changeSnappedPoints = () => {}
-
-  // Skip setMapData when disabled, ensure layer visibility when enabled
-  proto.setMapData = function (data) {
-    if (!this.status) {
-      return
-    }
-    const result = orig.setMapData.call(this, data)
-    if (data?.features?.length > 0 && this.map?.getLayer(SNAP_HELPER_LAYER)) {
-      this.map.setLayoutProperty(SNAP_HELPER_LAYER, 'visibility', 'visible')
-    }
-    return result
-  }
-
-  // Skip drawingSnapCheck when disabled
-  proto.drawingSnapCheck = function () {
-    if (!this.status) {
-      return
-    }
-    return orig.drawingSnapCheck.call(this)
-  }
-
-  // Fix typo: original uses 'coodinates' instead of 'coordinates' for Multi* types
-  // Also validate coordinates to prevent "coordinates must contain numbers" errors
-  proto.getLines = function (feature, mouse, radiusArg) {
-    const geom = feature.geometry
-    if (!geom || !geom.coordinates) {
-      return []
-    }
-    const coords = geom.coordinates
-    // Validate that we have actual coordinate arrays
-    if (!Array.isArray(coords) || coords.length === 0) {
-      return []
-    }
-    try {
-      if (geom.type === 'MultiPolygon') {
-        return coords.filter(c => Array.isArray(c) && c.length > 0).map(c => polygon(c))
-      }
-      if (geom.type === 'MultiLineString') {
-        return coords.filter(c => Array.isArray(c) && c.length > 0).map(c => lineString(c))
-      }
-      return orig.getLines.call(this, feature, mouse, radiusArg)
-    } catch (e) {
-      // Invalid geometry - skip this feature
-      console.log(e)
-      return []
-    }
-  }
-
-  // Query within radius bbox instead of just point, filter to existing layers
-  proto.getCloseFeatures = function (e, radiusInMeters) {
-    if (!this.status) {
-      return []
-    }
-    // Use active layers (per-call override) or fall back to default layers
-    const activeLayers = this._activeLayers || this._defaultLayers || []
-    this.options.layers = activeLayers.filter(l => this.map.getLayer(l))
-    const r = this.options.radius || 15
-    const origPt = e.point
-    e.point = [[origPt.x - r, origPt.y - r], [origPt.x + r, origPt.y + r]]
-    const result = orig.getCloseFeatures.call(this, e, radiusInMeters)
-    e.point = origPt
-    return result
-  }
-
-  // Custom colors for snap indicators
-  proto.searchInVertex = function (...args) {
-    const r = orig.searchInVertex.apply(this, args)
-    if (r) {
-      r.color = colors.vertex
-    }
-    return r
-  }
-  proto.searchInMidPoint = function (...args) {
-    const r = orig.searchInMidPoint.apply(this, args)
-    if (r) {
-      r.color = colors.midpoint
-    }
-    return r
-  }
-  proto.searchInEdge = function (...args) {
-    const r = orig.searchInEdge.apply(this, args)
-    if (r) {
-      r.color = colors.edge
-    }
-    return r
-  }
-
-  // Skip when disabled or zooming, clean up internal arrays to prevent memory accumulation
-  proto.snapToClosestPoint = function (e) {
-    if (!this.status || this.map?._isZooming) {
-      return
-    }
-    try {
-      const result = orig.snapToClosestPoint.call(this, e)
-      if (this.closeFeatures?.length > 100) {
-        this.closeFeatures.length = 0
-      }
-      if (this.lines?.length > 100) {
-        this.lines.length = 0
-      }
-      return result
-    } catch (err) {
-      // Invalid geometry encountered - clear state and continue
-      console.log(err)
-      this.snapStatus = false
-      this.snapCoords = null
-    }
-  }
-}
-
-/** Poll until checkFn returns truthy, then call onSuccess with the result */
-function pollUntil (checkFn, onSuccess) {
-  (function poll () {
-    const result = checkFn()
-    // null signals to stop polling, falsy continues polling
-    if (result === null) return
-    result ? onSuccess(result) : requestAnimationFrame(poll)
-  })()
-}
-
-/**
- * Patch a GeoJSON source to expose _data for MapboxSnap compatibility
- * MapboxSnap expects source._data.features but MapLibre doesn't expose this
- */
-export function patchSourceData (source) {
-  if (!source || (source._data && Array.isArray(source._data?.features))) {
-    return
-  }
-
-  let dataCache = { type: 'FeatureCollection', features: [] }
-  Object.defineProperty(source, '_data', {
-    get: () => dataCache,
-    set: (val) => {
-      dataCache = (val && typeof val === 'object' && Array.isArray(val.features))
-        ? val
-        : { type: 'FeatureCollection', features: [] }
-    },
-    configurable: true
-  })
-}
-
-/** Initialize MapboxSnap with MapLibre + MapboxDraw */
-export function initMapLibreSnap (map, draw, snapOptions = {}) {
-  // Prevent multiple initializations (causes event listener duplication)
-  if (map._snapInitialized) {
-    return map._snapInstance
-  }
-  map._snapInitialized = true
-
-  const {
-    layers = [],
-    radius = 15,
-    rules = ['vertex', 'midpoint', 'edge'],
-    status = false,
-    onSnapped = () => {},
-    colors = {}
-  } = snapOptions
-
-  // Apply global patches to MapboxSnap prototype
-  applyMapboxSnapPatches({ vertex: DEFAULTS.snapVertex, midpoint: DEFAULTS.snapMidpoint, edge: DEFAULTS.snapEdge, ...colors })
-
-  // Clean up old snap instance's source and layer
-  function cleanupOldSnap () {
-    if (map.getLayer(SNAP_HELPER_LAYER)) {
-      map.removeLayer(SNAP_HELPER_LAYER)
-    }
-    if (map.getSource(SNAP_HELPER_LAYER)) {
-      map.removeSource(SNAP_HELPER_LAYER)
-    }
-  }
-
-  // Create snap instance once source is available
-  function createSnap (source) {
-    // Prevent duplicate creation (race condition between initial poll and style.load)
-    if (map._snapInstance || map._snapCreating) {
-      return map._snapInstance
-    }
-
-    map._snapCreating = true
-
-    // Clean up any existing layer/source before creating new instance
-    cleanupOldSnap()
-
-    patchSourceData(source)
-
-    /** @type {any} */
-    const snap = new MapboxSnap({
-      map,
-      drawing: draw,
-      options: { layers, radius, rules },
-      status,
-      onSnapped
-    })
-
-    // Override the status property to prevent library from auto-setting it
-    // The library sets status=true on draw.modechange and draw.selectionchange
-    // We want external control only via setSnapStatus()
-    let controlledStatus = status
-
-    Object.defineProperty(snap, 'status', {
-      get () { // nosonar
-        return controlledStatus
-      },
-      set () { // nosonar
-        // intentionally empty: library writes are ignored
-      },
-      configurable: true
-    })
-
-    // Provide a controlled method for updating status
-    snap.setSnapStatus = (value) => {
-      controlledStatus = value
-    }
-
-    // Store default layers and provide method to override per-call
-    snap._defaultLayers = layers
-    snap._activeLayers = null
-
-    // Set snap layers (overrides defaults, pass null to reset to defaults)
-    snap.setSnapLayers = (overrideLayers) => {
-      if (overrideLayers === null || overrideLayers === undefined) {
-        snap._activeLayers = null // Use defaults
-      } else if (Array.isArray(overrideLayers)) {
-        snap._activeLayers = overrideLayers // Override defaults
-      } else {
-        // No action
-      }
-    }
-
-    // Apply any pending snap layers that were set before instance was ready
-    if (map._pendingSnapLayers !== undefined) {
-      snap.setSnapLayers(map._pendingSnapLayers)
-      delete map._pendingSnapLayers
-    }
-
-    map._snapInstance = snap
-
-    return snap
-  }
-
-  // Handle style changes - re-patch source and ensure snap layer exists
-  map.on('style.load', () => {
-    pollUntil(
-      () => map._removed ? null : map.getSource('mapbox-gl-draw-hot'),
-      (source) => {
-        patchSourceData(source)
-
-        // Restore snap source/layer if gone after style change
-        if (!map.getSource(SNAP_HELPER_LAYER)) {
-          map.addSource(SNAP_HELPER_LAYER, {
-            type: 'geojson',
-            data: { type: 'FeatureCollection', features: [] }
-          })
-        }
-        if (!map.getLayer(SNAP_HELPER_LAYER)) {
-          map.addLayer({
-            id: SNAP_HELPER_LAYER,
-            type: 'fill',
-            source: SNAP_HELPER_LAYER,
-            paint: { 'fill-color': ['get', 'color'], 'fill-opacity': 0.6 },
-            layout: { visibility: map._snapInstance?.status ? 'visible' : 'none' }
-          })
-        }
-
-        if (!map._snapInstance) {
-          createSnap(source)
-        }
-      }
-    )
-  })
-
-  // Suppress snap processing during zoom (indicator freezes in place)
-  map.on('zoomstart', () => {
-    map._isZooming = true
-  })
-
-  map.on('zoomend', () => {
-    map._isZooming = false
-    // Force hide then re-show to reset indicator at new zoom level (Safari fix)
-    if (map.getLayer(SNAP_HELPER_LAYER)) {
-      map.setLayoutProperty(SNAP_HELPER_LAYER, 'visibility', 'none')
-      const snap = map._snapInstance
-      if (snap?.status) {
-        map.setLayoutProperty(SNAP_HELPER_LAYER, 'visibility', 'visible')
-      }
-    }
-  })
-
-  // Initial setup - poll until draw source exists
-  pollUntil(
-    () => map._removed ? null : map.getSource('mapbox-gl-draw-hot'),
-    createSnap
-  )
-}
diff --git a/plugins/beta/draw-ml/src/modes/createDrawMode.js b/plugins/beta/draw-ml/src/modes/createDrawMode.js
deleted file mode 100644
index 0fe4f63f1..000000000
--- a/plugins/beta/draw-ml/src/modes/createDrawMode.js
+++ /dev/null
@@ -1,552 +0,0 @@
-import createVertex from '../../../../../node_modules/@mapbox/mapbox-gl-draw/src/lib/create_vertex.js' // NOSONAR
-
-import {
-  getSnapInstance,
-  isSnapActive,
-  isSnapEnabled,
-  getSnapLngLat,
-  triggerSnapAtPoint,
-  triggerSnapAtCenter,
-  createSnappedEvent,
-  createSnappedClickEvent
-} from '../utils/snapHelpers.js'
-
-/**
- * Factory function to create a draw mode for either polygons or lines.
- * Reduces duplication by sharing common event handling, snap detection, etc.
- *
- * @param {Object} ParentMode - DrawPolygon or DrawLineString from mapbox-gl-draw
- * @param {Object} config - Configuration for the mode
- * @param {string} config.featureProp - Property name on state ('polygon' or 'line')
- * @param {string} config.geometryType - 'Polygon' or 'LineString'
- * @param {Function} config.getCoords - Function to get coordinates from feature
- * @param {Function} config.validateClick - Validation function for clicks
- * @param {Function} config.createVertices - Function to create vertex display features
- */
-export const createDrawMode = (ParentMode, config) => { // NOSONAR — factory returns a single cohesive mode object; splitting across files would obscure the event flow
-  const {
-    featureProp,
-    geometryType,
-    getCoords,
-    validateClick,
-    createVertices,
-    excludeFeatureIdFromSetup = false,
-    finishOnInvalidClick = false // For lines: finish when clicking same spot (like double-click)
-  } = config
-
-  const getFeature = (state) => state[featureProp]
-  const RUBBER_BAND_OFFSET = 2 // ring is [...placed, last_placed, rubber_band]; splice(-2,1) removes last_placed
-
-  return {
-    ...ParentMode,
-
-    onSetup (options) {
-      const { map } = this
-
-      // Some parent modes (DrawLineString) interpret featureId as "continue existing"
-      // rather than "use this ID for new feature"
-      const parentOptions = excludeFeatureIdFromSetup
-        ? { ...options, featureId: null }
-        : options
-
-      const state = {
-        ...ParentMode.onSetup.call(this, parentOptions),
-        ...options
-      }
-
-      // Add initial props
-      state[featureProp].properties = options.properties
-
-      const { container, vertexMarkerId, getInterfaceType } = state
-      const currentInterfaceType = getInterfaceType ? getInterfaceType() : state.interfaceType
-      state.interfaceType = currentInterfaceType
-      const vertexMarker = container.querySelector(`#${vertexMarkerId}`)
-      state.vertexMarker = vertexMarker
-      if (['touch', 'keyboard'].includes(currentInterfaceType)) {
-        this._showCrossHair(state)
-      } else {
-        this._hideCrossHair(state)
-      }
-
-      // Bind all handlers once
-      const bind = (name, fn) => (this[name] = fn.bind(this, state))
-      const handlers = {
-        keydownHandler: this.onKeydown,
-        keyupHandler: this.onKeyup,
-        blurHandler: this.onBlur,
-        createHandler: this.onCreate,
-        moveHandler: this.onMove,
-        pointerdownHandler: this.onPointerdown,
-        pointermoveHandler: this.onPointermove,
-        pointerupHandler: this.onPointerup,
-        vertexButtonClickHandler: this.onVertexButtonClick,
-        undoHandler: this.onUndo
-      }
-      Object.entries(handlers).forEach(([k, fn]) => bind(k, fn))
-
-      // Register events
-      this._listeners = [
-        [window, 'keydown', this.keydownHandler],
-        [window, 'keyup', this.keyupHandler],
-        [window, 'click', this.vertexButtonClickHandler],
-        [container, 'blur', this.blurHandler],
-        [container, 'pointermove', this.pointermoveHandler],
-        [container, 'pointerup', this.pointerupHandler],
-        [map, 'pointerdown', this.pointerdownHandler],
-        [map, 'draw.create', this.createHandler],
-        [map, 'move', this.moveHandler],
-        [map, 'draw.undo', this.undoHandler]
-      ]
-      this._listeners.forEach(([t, e, h]) => t.addEventListener ? t.addEventListener(e, h) : t.on(e, h))
-
-      return state
-    },
-
-    onClick (state, e) {
-      // Skip non-primary clicks, undo operations, or clicks outside canvas
-      if (e.originalEvent.button > 0 || this.map._undoInProgress || e.originalEvent.target !== this.map.getCanvas()) {
-        return
-      }
-      const snap = getSnapInstance(this.map)
-      if (isSnapEnabled(state) && isSnapActive(snap)) {
-        e = createSnappedEvent(e, snap)
-      } else {
-        const coords = getCoords(getFeature(state))
-        if (coords.length > 0) {
-          coords[coords.length - 1] = [e.lngLat.lng, e.lngLat.lat]
-        }
-        // For polygon: prevent duplicate-coordinate clicks from reaching ParentMode, which
-        // would trigger a changeMode chain and cause a runtime error on coords.length access
-        if (!finishOnInvalidClick && !validateClick(getFeature(state))) {
-          return
-        }
-      }
-      const coordsBefore = getCoords(getFeature(state)).length
-      ParentMode.onClick.call(this, state, e)
-      // Push undo and update count if a vertex was added
-      if (getCoords(getFeature(state)).length > coordsBefore) {
-        this.pushDrawUndo(state)
-        this.dispatchVertexChange(getCoords(getFeature(state)))
-      }
-    },
-
-    onTap () {
-
-    },
-
-    doClick (state) {
-      // Skip during undo operation
-      if (this.map._undoInProgress) {
-        return
-      }
-
-      const feature = getFeature(state)
-      const coords = getCoords(feature)
-      this.dispatchVertexChange(coords)
-
-      if (!validateClick(feature)) {
-        // For lines: clicking same spot (like double-click) should finish the line
-        if (finishOnInvalidClick && coords.length > 1) {
-          coords.pop()
-          this.map.fire('draw.create', { features: [feature.toGeoJSON()] })
-          this.changeMode('simple_select', { featureIds: [feature.id] })
-        }
-        return
-      }
-
-      const snap = getSnapInstance(this.map)
-      const snappedEvent = isSnapEnabled(state) && createSnappedClickEvent(this.map, snap)
-      const coordsBefore = coords.length
-
-      if (snappedEvent) {
-        ParentMode.onClick.call(this, state, snappedEvent)
-        this._ctx.store.render()
-      } else {
-        this._simulateMouse('click', ParentMode.onClick, state)
-      }
-
-      // Push undo and update count if a vertex was added
-      const newCoords = getCoords(getFeature(state))
-      if (newCoords.length > coordsBefore) {
-        this.pushDrawUndo(state)
-        this.dispatchVertexChange(newCoords)
-      }
-    },
-
-    dispatchVertexChange (coords) {
-      // Both polygon ring and LineString store [v0...vN, rubber_band] during drawing — subtract 1 to get placed vertex count
-      this.map.fire('draw.vertexchange', {
-        numVertecies: Math.max(0, coords.length - 1)
-      })
-    },
-
-    /**
-     * Push an undo operation for the last added vertex
-     */
-    pushDrawUndo (state) {
-      const undoStack = this.map._undoStack
-      // Don't push during undo operations
-      if (!undoStack || this.map._undoInProgress) {
-        return
-      }
-      undoStack.push({
-        type: 'draw_vertex',
-        geometryType,
-        featureId: getFeature(state).id
-      })
-    },
-
-    /**
-     * Undo the last added vertex during drawing
-     */
-    undoVertex (state) {
-      const feature = getFeature(state)
-      const coords = getCoords(feature)
-
-      if (coords.length < 2) {
-        return false
-      }
-
-      // Undoing last vertex requires reinitializing the feature
-      if (coords.length === 2) {
-        return this._reinitializeFeature(state, feature)
-      }
-
-      this._removeLastVertex(state, feature, coords)
-      return true
-    },
-
-    /**
-     * Reinitialize feature when undoing to 0 vertices
-     * For Polygon: reinitialize in place
-     * For LineString: restart the draw mode with fresh state
-     */
-    _reinitializeFeature (state, feature) {
-      const featureId = feature.id
-      this._ctx.store.delete([featureId])
-
-      // LineString: restart the draw mode with fresh state but same feature ID
-      if (geometryType === 'LineString') {
-        const undoStack = this.map._undoStack
-        if (undoStack) {
-          undoStack.clear()
-        }
-        // Restart draw with same options (excludeFeatureIdFromSetup prevents "continue" mode)
-        this._ctx.api.changeMode('draw_line', {
-          featureId,
-          container: state.container,
-          interfaceType: state.interfaceType,
-          crossHair: state.crossHair,
-          vertexMarkerId: state.vertexMarkerId,
-          addVertexButtonId: state.addVertexButtonId,
-          getSnapEnabled: state.getSnapEnabled,
-          properties: state.properties
-        })
-        return true
-      }
-
-      // Polygon: reinitialize in place
-      const center = this.map.getCenter()
-      const initialCoords = [[center.lng, center.lat], [center.lng, center.lat]]
-      const newFeature = this.newFeature({
-        type: 'Feature',
-        properties: state.properties || {},
-        geometry: {
-          type: geometryType,
-          coordinates: [initialCoords]
-        }
-      })
-      newFeature.id = featureId
-      this._ctx.store.add(newFeature)
-
-      state[featureProp] = newFeature
-      state.currentVertexPosition = 0
-
-      this._ctx.store.render()
-      this._simulateMouse('mousemove', ParentMode.onMouseMove, state)
-      this._ctx.store.render()
-
-      this.dispatchVertexChange(initialCoords)
-      return true
-    },
-
-    /**
-     * Remove the last committed vertex and update rubber band
-     */
-    _removeLastVertex (state, feature, coords) {
-      // Structure during drawing: [v1, v2, ..., vN, rubber_band]
-      const ring = geometryType === 'Polygon' ? feature.coordinates[0] : coords
-      ring.splice(-RUBBER_BAND_OFFSET, 1)
-
-      // Snap rubber band to new last vertex position
-      const newLastVertex = ring[ring.length - 2]
-      if (newLastVertex) {
-        ring[ring.length - 1] = [...newLastVertex]
-      }
-
-      // Keep parent mode's vertex counter in sync (min 1 for rubber band)
-      state.currentVertexPosition = Math.max(1, state.currentVertexPosition - 1)
-
-      this._ctx.store.render()
-      this._updateRubberBand(state, getCoords(feature))
-    },
-
-    /**
-     * Update rubber band position based on interface type
-     */
-    _updateRubberBand (state, coords) {
-      if (['touch', 'keyboard'].includes(state.interfaceType)) {
-        // Touch/keyboard: move to map center for add point to work
-        this._simulateMouse('mousemove', ParentMode.onMouseMove, state)
-        this._ctx.store.render()
-      } else {
-        // Mouse: keep rubber band at current position
-        const rubberBandIndex = geometryType === 'Polygon' ? coords.length - 2 : coords.length - 1
-        const rubberBandPos = coords[rubberBandIndex]
-        if (rubberBandPos) {
-          const lngLat = { lng: rubberBandPos[0], lat: rubberBandPos[1] }
-          const point = this.map.project(lngLat)
-          ParentMode.onMouseMove.call(this, state, {
-            lngLat,
-            point,
-            originalEvent: new MouseEvent('mousemove', { clientX: point.x, clientY: point.y })
-          })
-          this._ctx.store.render()
-        }
-      }
-      this.dispatchVertexChange(coords)
-    },
-
-    /**
-     * Handle draw.undo event
-     */
-    onUndo (state, e) {
-      if (e.operation?.type === 'draw_vertex') {
-        this.undoVertex(state)
-      }
-    },
-
-    _simulateMouse (type, fn, state) {
-      const { map } = this
-      const center = map.getCenter()
-      const point = map.project(center)
-      fn.call(this, state, {
-        lngLat: center,
-        point,
-        originalEvent: new MouseEvent(type, {
-          clientX: point.x,
-          clientY: point.y,
-          bubbles: true,
-          cancelable: true
-        })
-      })
-      this._ctx.store.render()
-
-      this.map.fire('draw.geometrychange', state.polygon || state.line)
-    },
-
-    _showCrossHair (state) {
-      if (state.crossHair) { state.crossHair.show() } else { state.vertexMarker.style.display = 'block' }
-    },
-
-    _hideCrossHair (state) {
-      if (state.crossHair) { state.crossHair.hide() } else { state.vertexMarker.style.display = 'none' }
-    },
-
-    _setInterface (state, type, show = true) {
-      state.interfaceType = type
-      if (show) {
-        this._showCrossHair(state)
-      }
-    },
-
-    onCreate (state, e) {
-      const draw = this._ctx.api
-      const feature = e.features[0]
-      draw.delete(feature.id)
-      feature.id = state.featureId
-      draw.add(feature, { userProperties: true })
-    },
-
-    onVertexButtonClick (state, e) {
-      // Only trigger for the specific add vertex button, and skip during undo
-      if (state.addVertexButtonId && !this.map._undoInProgress && e.target.closest(`#${state.addVertexButtonId}`)) {
-        this.doClick(state)
-      }
-    },
-
-    onTouchStart (state, e) {
-      this._setInterface(state, 'touch')
-      this.onMove(state, e)
-    },
-
-    onTouchEnd (state, e) {
-      this._setInterface(state, 'touch')
-      this.onMove(state, e)
-    },
-
-    _handleUndoKeydown (state, e) {
-      const tag = document.activeElement?.tagName
-      if (tag === 'INPUT' || tag === 'TEXTAREA') {
-        return
-      }
-      e.preventDefault()
-      e.stopPropagation()
-      const undoStack = this.map._undoStack
-      if (undoStack && undoStack.length > 0) {
-        const operation = undoStack.pop()
-        if (operation?.type === 'draw_vertex') {
-          // Set flag to prevent click interference during undo
-          this.map._undoInProgress = true
-          setTimeout(() => { this.map._undoInProgress = false }, 100)
-          this.undoVertex(state)
-        }
-      }
-    },
-
-    onKeydown (state, e) {
-      if (e.key === 'z' && (e.metaKey || e.ctrlKey) && !e.shiftKey) {
-        this._handleUndoKeydown(state, e)
-        return
-      }
-      if (document.activeElement !== state.container) {
-        return
-      }
-      if (e.key === 'Escape') {
-        e.preventDefault()
-        return
-      }
-      if (e.key === 'Enter') {
-        state.isActive = true
-      }
-      this._setInterface(state, 'keyboard')
-      this.onMove(state, e)
-    },
-
-    onKeyup (state, e) {
-      if (e.key === 'Escape') {
-        if (state.interfaceType !== 'keyboard') {
-          // Mouse/touch: cancel drawing — onKeyUp (capital U) won't fire since container isn't focused
-          this.map.fire('draw.cancel')
-        }
-        // Keyboard: onKeyUp (capital U) handles reinitialize (container is focused, event reaches it)
-        return
-      }
-      if (document.activeElement !== state.container) {
-        return
-      }
-      this._setInterface(state, 'keyboard')
-      this.onMove(state, e)
-      if (e.key === 'Enter' && state.isActive) {
-        this.doClick(state)
-      }
-    },
-
-    // Called by mapbox-gl-draw's event system (capital U — distinct from onKeyup above).
-    // Registered on ctx.container, so only fires when the viewport has focus (keyboard drawing).
-    //   1. A UI element inside the viewport has focus (e.g. popup menu) → ignore, let React handle
-    //   2. Keyboard drawing (container focused, interfaceType === 'keyboard') → Escape restarts
-    //   3. Non-keyboard with container focused → skip (already handled by window onKeyup via draw.cancel)
-    onKeyUp (state, e) {
-      const activeEl = document.activeElement
-      if (activeEl && activeEl !== state.container && state.container.contains(activeEl)) {
-        return
-      }
-      if (e.key === 'Escape') {
-        if (state.interfaceType === 'keyboard') {
-          const undoStack = this.map._undoStack
-          if (undoStack) {
-            undoStack.clear()
-          }
-          this._reinitializeFeature(state, getFeature(state))
-        }
-        // Non-keyboard already handled by onKeyup (window) via draw.cancel
-        return
-      }
-      if (activeEl !== state.container) {
-        ParentMode.onKeyUp.call(this, state, e)
-      }
-    },
-
-    onBlur (state, e) {
-      if (e.target !== state.container) {
-        this._hideCrossHair(state)
-      }
-    },
-
-    onMouseMove (state, e) {
-      if (isSnapEnabled(state)) {
-        const snap = getSnapInstance(this.map)
-        triggerSnapAtPoint(snap, this.map, e.point)
-
-        const snappedLngLat = getSnapLngLat(snap)
-        if (snappedLngLat) {
-          e = { ...e, lngLat: snappedLngLat }
-        }
-      }
-
-      this.map.fire('draw.geometrychange', state.polygon || state.line)
-
-      ParentMode.onMouseMove.call(this, state, e)
-    },
-
-    onMove (state) {
-      if (['touch', 'keyboard'].includes(state.interfaceType)) {
-        if (isSnapEnabled(state)) {
-          triggerSnapAtCenter(getSnapInstance(this.map), this.map)
-        }
-
-        const snap = getSnapInstance(this.map)
-        const snappedLngLat = isSnapEnabled(state) && getSnapLngLat(snap)
-
-        if (snappedLngLat) {
-          const point = this.map.project([snappedLngLat.lng, snappedLngLat.lat])
-          ParentMode.onMouseMove.call(this, state, {
-            lngLat: snappedLngLat,
-            point,
-            originalEvent: new MouseEvent('mousemove', {
-              clientX: point.x,
-              clientY: point.y,
-              bubbles: true,
-              cancelable: true
-            })
-          })
-          this._ctx.store.render()
-        } else {
-          this._simulateMouse('mousemove', ParentMode.onMouseMove, state)
-        }
-      }
-    },
-
-    onPointerdown (state, e) {
-      if (e.pointerType !== 'touch') {
-        this._setInterface(state, 'mouse', false)
-      }
-    },
-
-    onPointermove (state, e) {
-      if (e.pointerType !== 'touch') {
-        this._hideCrossHair(state)
-      }
-    },
-
-    onPointerup (state) {
-      this.dispatchVertexChange(getCoords(getFeature(state)))
-    },
-
-    toDisplayFeatures (state, geojson, display) {
-      ParentMode.toDisplayFeatures.call(this, state, geojson, display)
-
-      const feature = getFeature(state)
-      if (geojson.geometry.type === geometryType && geojson.id === feature.id) {
-        createVertices(geojson, display, createVertex)
-      }
-    },
-
-    onStop (state) {
-      ParentMode.onStop.call(this, state)
-      this._listeners.forEach(([t, e, h]) => t.removeEventListener ? t.removeEventListener(e, h) : t.off(e, h))
-      this._hideCrossHair(state)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ml/src/modes/disabledMode.js b/plugins/beta/draw-ml/src/modes/disabledMode.js
deleted file mode 100755
index 7f15e5cea..000000000
--- a/plugins/beta/draw-ml/src/modes/disabledMode.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export const DisabledMode = {
-  onSetup () {
-    return {} // Return empty state
-  },
-
-  onClick () {
-    // Prevent feature selection
-    return false
-  },
-
-  onKeyUp () {
-    return false
-  },
-
-  onDrag () {
-    return false
-  },
-
-  toDisplayFeatures (state, geojson, display) {
-    geojson.properties.active = 'false'
-    display(geojson)
-  }
-}
diff --git a/plugins/beta/draw-ml/src/modes/drawLineMode.js b/plugins/beta/draw-ml/src/modes/drawLineMode.js
deleted file mode 100644
index 1b3aade57..000000000
--- a/plugins/beta/draw-ml/src/modes/drawLineMode.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import DrawLineString from '../../../../../node_modules/@mapbox/mapbox-gl-draw/src/modes/draw_line_string.js'
-import { isValidLineClick } from '../utils/spatial.js'
-import { createDrawMode } from './createDrawMode.js'
-
-export const DrawLineMode = createDrawMode(DrawLineString, {
-  featureProp: 'line',
-  geometryType: 'LineString',
-  getCoords: (feature) => feature.coordinates,
-  validateClick: (feature) => isValidLineClick(feature.coordinates),
-  excludeFeatureIdFromSetup: true, // DrawLineString interprets featureId as "continue existing"
-  finishOnInvalidClick: true, // Clicking same spot (like double-click) finishes the line
-  createVertices: (geojson, display, createVertex) => {
-    const coords = geojson.geometry.coordinates
-    for (let i = 1; i < coords.length - 1; i++) {
-      display(createVertex(geojson.id, coords[i], `${i}`))
-    }
-  }
-})
diff --git a/plugins/beta/draw-ml/src/modes/drawPolygonMode.js b/plugins/beta/draw-ml/src/modes/drawPolygonMode.js
deleted file mode 100755
index f68fb568a..000000000
--- a/plugins/beta/draw-ml/src/modes/drawPolygonMode.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import DrawPolygon from '../../../../../node_modules/@mapbox/mapbox-gl-draw/src/modes/draw_polygon.js'
-import { isValidClick } from '../utils/spatial.js'
-import { createDrawMode } from './createDrawMode.js'
-
-export const DrawPolygonMode = createDrawMode(DrawPolygon, {
-  featureProp: 'polygon',
-  geometryType: 'Polygon',
-  getCoords: (feature) => feature.coordinates[0],
-  validateClick: (feature) => isValidClick(feature.coordinates),
-  createVertices: (geojson, display, createVertex) => {
-    const ring = geojson.geometry.coordinates[0]
-    for (let i = 1; i < ring.length - 2; i++) {
-      display(createVertex(geojson.id, ring[i], `0.${i}`))
-    }
-  }
-})
diff --git a/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js b/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js
deleted file mode 100644
index 47e9e3305..000000000
--- a/plugins/beta/draw-ml/src/modes/editVertex/geometryHelpers.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Pure geometry helper functions for multi-ring/multi-part geometry support.
- * These functions handle coordinate transformations between flat arrays and
- * hierarchical GeoJSON structures for Polygon, MultiPolygon, LineString, and MultiLineString.
- */
-
-/**
- * Get flat coordinates array from feature for all geometry types.
- * Flattens all rings/parts into a single array for unified vertex navigation.
- *
- * @param {Object} feature - GeoJSON geometry object
- * @returns {Array<[number, number]>} Flat array of all coordinates
- */
-export const getCoords = (feature) => {
-  if (!feature?.coordinates) return []
-  switch (feature.type) {
-    case 'LineString':
-      return feature.coordinates
-    case 'Polygon':
-      return feature.coordinates.flat(1)
-    case 'MultiLineString':
-      return feature.coordinates.flat(1)
-    case 'MultiPolygon':
-      return feature.coordinates.flat(2)
-    default:
-      return []
-  }
-}
-
-/**
- * Get segment metadata for multi-ring/multi-part geometries.
- * Each segment represents a ring (for Polygon) or part (for Multi*).
- *
- * @param {Object} feature - GeoJSON geometry object
- * @returns {Array<{start: number, length: number, path: number[], closed: boolean}>}
- *   Array of segment metadata objects where:
- *   - start: Starting index in flat coordinates array
- *   - length: Number of coordinates in this segment
- *   - path: Hierarchical path indices to reach this segment in GeoJSON
- *   - closed: Whether this segment is closed (true for Polygon rings)
- */
-export const getRingSegments = (feature) => {
-  if (!feature?.coordinates) return []
-  const segments = []
-  let start = 0
-
-  switch (feature.type) {
-    case 'LineString':
-      segments.push({ start: 0, length: feature.coordinates.length, path: [], closed: false })
-      break
-    case 'Polygon':
-      feature.coordinates.forEach((ring, ringIdx) => {
-        segments.push({ start, length: ring.length, path: [ringIdx], closed: true })
-        start += ring.length
-      })
-      break
-    case 'MultiLineString':
-      feature.coordinates.forEach((line, lineIdx) => {
-        segments.push({ start, length: line.length, path: [lineIdx], closed: false })
-        start += line.length
-      })
-      break
-    case 'MultiPolygon':
-      feature.coordinates.forEach((polygon, polyIdx) => {
-        polygon.forEach((ring, ringIdx) => {
-          segments.push({ start, length: ring.length, path: [polyIdx, ringIdx], closed: true })
-          start += ring.length
-        })
-      })
-      break
-    default:
-      break
-  }
-
-  return segments
-}
-
-/**
- * Find which segment a flat vertex index belongs to.
- *
- * @param {Array} segments - Array of segment metadata from getRingSegments
- * @param {number} flatIdx - Flat vertex index
- * @returns {{segment: Object, localIdx: number}|null}
- *   Object with segment metadata and local index within that segment, or null if not found
- */
-export const getSegmentForIndex = (segments, flatIdx) => {
-  for (const seg of segments) {
-    if (flatIdx >= seg.start && flatIdx < seg.start + seg.length) {
-      return { segment: seg, localIdx: flatIdx - seg.start }
-    }
-  }
-  return null
-}
-
-/**
- * Get modifiable coordinate array at a specific hierarchical path.
- * Returns a reference to the actual coordinate array in the GeoJSON structure.
- *
- * @param {Object} geojson - Full GeoJSON feature object
- * @param {number[]} path - Hierarchical path indices (e.g., [0] for first ring, [1, 0] for second polygon's first ring)
- * @returns {Array<[number, number]>} Reference to coordinate array at path
- */
-export const getModifiableCoords = (geojson, path) => {
-  let coords = geojson.geometry.coordinates
-  for (const idx of path) {
-    coords = coords[idx]
-  }
-  return coords
-}
-
-/**
- * Convert mapbox-gl-draw coord_path string to flat vertex index.
- * coord_path format: "ringIdx.vertexIdx" for Polygon, "polyIdx.ringIdx.vertexIdx" for MultiPolygon, etc.
- *
- * @param {Object} feature - GeoJSON geometry object
- * @param {string} coordPath - coord_path string from mapbox-gl-draw
- * @returns {number} Flat vertex index in the unified coordinate array
- */
-export const coordPathToFlatIndex = (feature, coordPath) => {
-  const parts = coordPath.split('.').map(Number)
-  const segments = getRingSegments(feature)
-
-  // Match coord_path to segment
-  for (const seg of segments) {
-    // Check if path matches (compare all but last element which is the local vertex index)
-    const pathMatches = seg.path.every((val, idx) => val === parts[idx])
-    if (pathMatches && parts.length === seg.path.length + 1) {
-      const localIdx = parts[parts.length - 1]
-      return seg.start + localIdx
-    }
-  }
-
-  // Fallback: just use the last number (works for simple geometries)
-  return parts[parts.length - 1]
-}
diff --git a/plugins/beta/draw-ml/src/modes/editVertex/helpers.js b/plugins/beta/draw-ml/src/modes/editVertex/helpers.js
deleted file mode 100644
index 29e29e091..000000000
--- a/plugins/beta/draw-ml/src/modes/editVertex/helpers.js
+++ /dev/null
@@ -1,2 +0,0 @@
-export const scalePoint = (point, scale) => ({ x: point.x * scale, y: point.y * scale })
-export const isOnSVG = (el) => el instanceof window.SVGElement || el.ownerSVGElement
diff --git a/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js b/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js
deleted file mode 100644
index cabce04e4..000000000
--- a/plugins/beta/draw-ml/src/modes/editVertex/touchHandlers.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import {
-  getSnapInstance, isSnapEnabled, triggerSnapAtPoint, getSnapLngLat,
-  clearSnapState, clearSnapIndicator
-} from '../../utils/snapHelpers.js'
-import { coordPathToFlatIndex } from './geometryHelpers.js'
-import { isOnSVG } from './helpers.js'
-
-const touchVertexTarget = `
-  <svg width='48' height='48' viewBox='0 0 48 48' fill-rule='evenodd' style='display:none;position:absolute;top:50%;left:50%;margin:24px 0 0 -24px' class='touch-vertex-target' data-touch-vertex-target>
-    <circle cx='24' cy='24' r='24' fill='var(--touch-fill, #000)'/>
-    <path d="M37.543 25H34a1 1 0 1 1 0-2h3.629l-.836-.837a1 1 0 0 1 1.414-1.414l2.5 2.501A1 1 0 0 1 41 24a1 1 0 0 1-.487.858l-2.306 2.306a1 1 0 0 1-1.414-1.414l.75-.75zM23 10.414l-.793.793a1 1 0 0 1-1.414-1.414l2.5-2.5C23.481 7.105 23.734 7 24 7s.519.105.707.293l2.5 2.5a1 1 0 0 1-1.414 1.414L25 10.414V14a1 1 0 1 1-2 0v-3.586zM7 24a1 1 0 0 1 .293-.75l2.5-2.501a1 1 0 0 1 1.414 1.414l-.836.837H14a1 1 0 1 1 0 2h-3.543l.75.75a1 1 0 0 1-1.414 1.414l-2.306-2.306A1 1 0 0 1 7 24zm16.293 16.707l-2.5-2.5a1 1 0 0 1 1.414-1.414l.793.793V34a1 1 0 1 1 2 0v3.586l.793-.793a1 1 0 0 1 1.414 1.414l-2.5 2.5c-.188.188-.441.293-.707.293s-.519-.105-.707-.293zM24 20c2.208 0 4 1.792 4 4s-1.792 4-4 4-4-1.792-4-4 1.792-4 4-4z" fill='var(--touch-gfx, #fff)'/>
-  </svg>
-`
-
-export const applyTouchVertexColors = (el, mapStyle) => {
-  if (!el) { return }
-  const dark = mapStyle?.mapColorScheme === 'dark'
-  el.style.setProperty('--touch-fill', dark ? '#ffffff' : '#000000')
-  el.style.setProperty('--touch-gfx', dark ? '#000000' : '#ffffff')
-}
-
-export const touchHandlers = {
-  addTouchVertexTarget (state) {
-    let el = state.container.querySelector('[data-touch-vertex-target]')
-    if (!el) {
-      state.container.insertAdjacentHTML('beforeend', touchVertexTarget)
-      el = state.container.querySelector('[data-touch-vertex-target]')
-    }
-    state.touchVertexTarget = el
-    applyTouchVertexColors(el, this.map._drawCurrentMapStyle)
-  },
-
-  updateTouchVertexTarget (state, point) {
-    if (point && state.interfaceType === 'touch' && state.selectedVertexIndex >= 0) {
-      Object.assign(state.touchVertexTarget.style, { display: 'block', top: `${point.y}px`, left: `${point.x}px` })
-    } else {
-      state.touchVertexTarget.style.display = 'none'
-    }
-  },
-
-  hideTouchVertexIndicator (state) {
-    state.touchVertexTarget.style.display = 'none'
-  },
-
-  onPointerevent (state, e) {
-    state.interfaceType = e.pointerType === 'touch' ? 'touch' : 'mouse'
-    state.isPanEnabled = true
-    if (e.pointerType === 'touch' && e.type === 'pointermove' && !isOnSVG(e.target.parentNode) && !state._ignorePointermoveDeselect) {
-      this.changeMode(state, { selectedVertexIndex: -1, selectedVertexType: null, coordPath: null })
-    }
-  },
-
-  // Empty stubs required by DirectSelect
-  onTouchStart () {},
-  onTouchMove () {},
-  onTouchEnd () {},
-
-  onTouchend (state) {
-    clearSnapState(getSnapInstance(this.map))
-    if (state?.featureId) {
-      this.syncVertices(state)
-
-      // Push undo for the move if touch actually moved
-      if (state._touchMoved && state._moveStartPosition && state._moveStartIndex !== undefined) {
-        this.pushUndo({
-          type: 'move_vertex',
-          featureId: state.featureId,
-          vertexIndex: state._moveStartIndex,
-          previousPosition: state._moveStartPosition
-        })
-      }
-      state._moveStartPosition = null
-      state._moveStartIndex = undefined
-      state._touchMoved = false
-    }
-  },
-
-  onTap (state, e) {
-    // Hide snap indicator on any tap
-    const snap = getSnapInstance(this.map)
-    if (snap) {
-      clearSnapIndicator(snap, this.map)
-    }
-
-    const meta = e.featureTarget?.properties.meta
-    const coordPath = e.featureTarget?.properties.coord_path
-
-    if (meta === 'vertex') {
-      const feature = this.getFeature(state.featureId)
-      const idx = coordPathToFlatIndex(feature, coordPath)
-      this.changeMode(state, {
-        selectedVertexIndex: idx,
-        selectedVertexType: 'vertex',
-        coordPath
-      })
-    } else if (meta === 'midpoint') {
-      this.insertVertex({ ...state, selectedVertexIndex: this.getVertexIndexFromMidpoint(state, coordPath), selectedVertexType: 'midpoint' })
-    } else {
-      this.clickNoTarget(state)
-    }
-  },
-
-  onTouchstart (state, e) {
-    clearSnapState(getSnapInstance(this.map))
-    const vertex = state.vertecies?.[state.selectedVertexIndex]
-    if (!vertex || !isOnSVG(e.target.parentNode)) {
-      return
-    }
-
-    // Save starting position for undo
-    state._moveStartPosition = [...vertex]
-    state._moveStartIndex = state.selectedVertexIndex
-    state._touchMoved = false
-
-    const touch = { x: e.touches[0].clientX, y: e.touches[0].clientY }
-    const style = window.getComputedStyle(state.touchVertexTarget)
-    state.deltaTarget = { x: touch.x - Number.parseFloat(style.left), y: touch.y - Number.parseFloat(style.top) }
-    const vertexPt = this.map.project(vertex)
-    state.deltaVertex = { x: (touch.x / state.scale) - vertexPt.x, y: (touch.y / state.scale) - vertexPt.y }
-  },
-
-  onTouchmove (state, e) {
-    if (state.selectedVertexIndex < 0 || !isOnSVG(e.target.parentNode)) {
-      return
-    }
-
-    state._touchMoved = true
-
-    const touch = { x: e.touches[0].clientX, y: e.touches[0].clientY }
-    const screenPt = { x: (touch.x / state.scale) - state.deltaVertex.x, y: (touch.y / state.scale) - state.deltaVertex.y }
-
-    let finalCoord = this.map.unproject(screenPt)
-    if (isSnapEnabled(state)) {
-      const snap = getSnapInstance(this.map)
-      triggerSnapAtPoint(snap, this.map, screenPt)
-      finalCoord = getSnapLngLat(snap) || finalCoord
-    }
-
-    this.moveVertex(state, finalCoord)
-    this.updateTouchVertexTarget(state, { x: touch.x - state.deltaTarget.x, y: touch.y - state.deltaTarget.y })
-  }
-}
diff --git a/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js b/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js
deleted file mode 100644
index f87db359f..000000000
--- a/plugins/beta/draw-ml/src/modes/editVertex/undoHandlers.js
+++ /dev/null
@@ -1,133 +0,0 @@
-import {
-  getRingSegments,
-  getSegmentForIndex,
-  getModifiableCoords
-} from './geometryHelpers.js'
-import { scalePoint } from './helpers.js'
-
-export const undoHandlers = {
-  // Fire geometry change event (for external listeners)
-  fireGeometryChange (state) {
-    const feature = this.getFeature(state.featureId)
-    if (feature) {
-      this.map.fire('draw.update', {
-        features: [feature.toGeoJSON()],
-        action: 'change_coordinates'
-      })
-    }
-  },
-
-  // Undo support
-  pushUndo (operation) {
-    const undoStack = this.map._undoStack
-    if (!undoStack) {
-      return
-    }
-    undoStack.push(operation)
-  },
-
-  handleUndo (state) {
-    const undoStack = this.map._undoStack
-    if (!undoStack || undoStack.length === 0) {
-      return
-    }
-
-    const op = undoStack.pop()
-
-    if (op.type === 'move_vertex') {
-      this.undoMoveVertex(state, op)
-    } else if (op.type === 'insert_vertex') {
-      this.undoInsertVertex(state, op)
-    } else if (op.type === 'delete_vertex') {
-      this.undoDeleteVertex(state, op)
-    }
-  },
-
-  undoMoveVertex (state, op) {
-    const { vertexIndex, previousPosition, featureId } = op
-    const feature = this.getFeature(featureId)
-    if (!feature) return
-
-    const geojson = feature.toGeoJSON()
-    const segments = getRingSegments(feature)
-    const result = getSegmentForIndex(segments, vertexIndex)
-    if (!result) return
-
-    const coords = getModifiableCoords(geojson, result.segment.path)
-    coords[result.localIdx] = previousPosition
-    this._applyUndoAndSync(state, geojson, featureId)
-
-    // Update touch vertex target position
-    const vertex = state.vertecies[state.selectedVertexIndex]
-    if (vertex) {
-      this.updateTouchVertexTarget(state, scalePoint(this.map.project(vertex), state.scale))
-    }
-  },
-
-  undoInsertVertex (state, op) {
-    const { vertexIndex, featureId } = op
-    const feature = this.getFeature(featureId)
-    if (!feature) return
-
-    const geojson = feature.toGeoJSON()
-    const segments = getRingSegments(feature)
-    const result = getSegmentForIndex(segments, vertexIndex)
-    if (!result) return
-
-    const coords = getModifiableCoords(geojson, result.segment.path)
-    coords.splice(result.localIdx, 1)
-    this._applyUndoAndSync(state, geojson, featureId)
-
-    // Clear DirectSelect's coordinate selection
-    this.clearSelectedCoordinates()
-    this.hideTouchVertexIndicator(state)
-    this.changeMode(state, { selectedVertexIndex: -1, selectedVertexType: null })
-  },
-
-  undoDeleteVertex (state, op) {
-    const { vertexIndex, position, featureId } = op
-    const feature = this.getFeature(featureId)
-    if (!feature) {
-      return
-    }
-
-    const geojson = feature.toGeoJSON()
-    const segments = getRingSegments(feature)
-
-    // Try to find segment containing vertexIndex
-    let result = getSegmentForIndex(segments, vertexIndex)
-
-    // If not found, vertex might be at segment boundary
-    if (!result) {
-      for (const seg of segments) {
-        if (vertexIndex === seg.start + seg.length) {
-          result = { segment: seg, localIdx: seg.length }
-          break
-        }
-      }
-    }
-
-    if (!result) {
-      return
-    }
-
-    const coords = getModifiableCoords(geojson, result.segment.path)
-    coords.splice(result.localIdx, 0, position)
-    this._applyUndoAndSync(state, geojson, featureId)
-
-    // Update touch vertex target to restored vertex position
-    const vertex = state.vertecies[vertexIndex]
-    if (vertex) {
-      this.updateTouchVertexTarget(state, scalePoint(this.map.project(vertex), state.scale))
-    }
-    this.changeMode(state, { selectedVertexIndex: vertexIndex, selectedVertexType: 'vertex', coordPath: this.getCoordPath(state, vertexIndex) })
-  },
-
-  _applyUndoAndSync (state, geojson, featureId) {
-    this._ctx.api.add(geojson)
-    state.vertecies = this.getVerticies(featureId)
-    state.midpoints = this.getMidpoints(featureId)
-    this._ctx.store.render()
-    this.fireGeometryChange(state)
-  }
-}
diff --git a/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js b/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js
deleted file mode 100644
index 634754e7c..000000000
--- a/plugins/beta/draw-ml/src/modes/editVertex/vertexOperations.js
+++ /dev/null
@@ -1,142 +0,0 @@
-import {
-  getCoords,
-  getRingSegments,
-  getSegmentForIndex,
-  getModifiableCoords
-} from './geometryHelpers.js'
-
-const ARROW_OFFSETS = { ArrowUp: [0, -1], ArrowDown: [0, 1], ArrowLeft: [-1, 0], ArrowRight: [1, 0] }
-const NUDGE = 1; const STEP = 5
-
-export const vertexOperations = {
-  updateMidpoint (coordinates) {
-    setTimeout(() => {
-      this.map.getSource('mapbox-gl-draw-hot').setData({
-        type: 'Feature',
-        properties: { meta: 'midpoint', active: 'true', id: 'active-midpoint' },
-        geometry: { type: 'Point', coordinates }
-      })
-    }, 0)
-  },
-
-  updateVertex (state, direction) {
-    const [idx, type] = this.getVertexOrMidpoint(state, direction)
-    if (idx < 0 || !type) {
-      return
-    }
-    this.changeMode(state, { selectedVertexIndex: idx, selectedVertexType: type, ...(type === 'vertex' && { coordPath: this.getCoordPath(state, idx) }) })
-  },
-
-  getOffset (coord, e) {
-    const pt = this.map.project(coord)
-    const offset = e?.shiftKey ? NUDGE : STEP
-    const [dx, dy] = e ? ARROW_OFFSETS[e.key].map(v => v * offset) : [0, 0]
-    return this.map.unproject({ x: pt.x + dx, y: pt.y + dy })
-  },
-
-  getNewCoord (state, e) {
-    return this.getOffset(getCoords(this.getFeature(state.featureId))[state.selectedVertexIndex], e)
-  },
-
-  insertVertex (state, e) {
-    const midIdx = state.selectedVertexIndex - state.vertecies.length
-    const newCoord = this.getOffset(state.midpoints[midIdx], e)
-    const feature = this.getFeature(state.featureId)
-    const geojson = feature.toGeoJSON()
-
-    // Find which segment this midpoint belongs to and calculate insertion position
-    const segments = getRingSegments(feature)
-    let globalInsertIdx = midIdx + 1
-    let insertSegment = null
-    let localInsertIdx = 0
-
-    // Map midpoint index to segment and local position
-    let midpointCounter = 0
-    for (const seg of segments) {
-      // Must match getMidpoints calculation
-      const segMidpoints = seg.closed ? seg.length : seg.length - 1
-      if (midIdx < midpointCounter + segMidpoints) {
-        insertSegment = seg
-        localInsertIdx = (midIdx - midpointCounter) + 1
-        globalInsertIdx = seg.start + localInsertIdx
-        break
-      }
-      midpointCounter += segMidpoints
-    }
-
-    if (!insertSegment) return
-
-    const coords = getModifiableCoords(geojson, insertSegment.path)
-    coords.splice(localInsertIdx, 0, [newCoord.lng, newCoord.lat])
-    this._ctx.api.add(geojson)
-
-    this.pushUndo({ type: 'insert_vertex', featureId: state.featureId, vertexIndex: globalInsertIdx })
-    this.changeMode(state, { selectedVertexIndex: globalInsertIdx, selectedVertexType: 'vertex', coordPath: this.getCoordPath(state, globalInsertIdx) })
-  },
-
-  moveVertex (state, coord, options = {}) {
-    if (options.checkSnap && state.enableSnap !== false) {
-      const snap = this.map._snapInstance
-      if (snap?.snapStatus && snap.snapCoords?.length >= 2) {
-        coord = { lng: snap.snapCoords[0], lat: snap.snapCoords[1] }
-      }
-    }
-
-    const feature = this.getFeature(state.featureId)
-    const geojson = feature.toGeoJSON()
-    const segments = getRingSegments(feature)
-    const result = getSegmentForIndex(segments, state.selectedVertexIndex)
-    if (!result) return
-
-    const coords = getModifiableCoords(geojson, result.segment.path)
-    coords[result.localIdx] = [coord.lng, coord.lat]
-    this._ctx.api.add(geojson)
-    state.vertecies = this.getVerticies(state.featureId)
-
-    this.map.fire('draw.geometrychange', state.feature)
-  },
-
-  deleteVertex (state) {
-    const feature = this.getFeature(state.featureId)
-    if (!feature) {
-      return
-    }
-
-    const segments = getRingSegments(feature)
-    const result = getSegmentForIndex(segments, state.selectedVertexIndex)
-    if (!result) {
-      return
-    }
-
-    const { segment } = result
-    // Minimum vertices per segment: 3 for closed rings (mapbox-gl-draw's internal representation), 2 for lines
-    const minVertices = segment.closed ? 3 : 2
-    if (segment.length <= minVertices) {
-      return
-    }
-
-    // Save position for undo before deletion
-    const deletedPosition = [...state.vertecies[state.selectedVertexIndex]]
-    const deletedIndex = state.selectedVertexIndex
-
-    // Remove the coordinate directly rather than via this._ctx.api.trash(), which routes through
-    // DirectSelect.trash() and calls onSetup({ featureId }) with incomplete options, crashing event registration.
-    const coordPath = [...result.segment.path, result.localIdx].join('.')
-    feature.removeCoordinate(coordPath)
-    this.fireUpdate()
-    this.clearSelectedCoordinates()
-    feature.changed()
-    this._ctx.store.render()
-
-    // Push undo operation
-    this.pushUndo({
-      type: 'delete_vertex',
-      featureId: state.featureId,
-      vertexIndex: deletedIndex,
-      position: deletedPosition
-    })
-
-    // Clear selection after delete
-    this.changeMode(state, { selectedVertexIndex: -1, selectedVertexType: null })
-  }
-}
diff --git a/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js b/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js
deleted file mode 100644
index 5245bf217..000000000
--- a/plugins/beta/draw-ml/src/modes/editVertex/vertexQueries.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import {
-  getCoords,
-  getRingSegments,
-  getSegmentForIndex
-} from './geometryHelpers.js'
-import { spatialNavigate } from '../../utils/spatial.js'
-
-export const vertexQueries = {
-  findVertexIndex (coords, targetCoord, currentIdx) {
-    // Search for vertex, preferring matches near currentIdx to handle duplicate coords (e.g., closing vertices)
-    const matches = []
-    coords.forEach((c, i) => {
-      if (c[0] === targetCoord[0] && c[1] === targetCoord[1]) {
-        matches.push(i)
-      }
-    })
-
-    if (matches.length === 0) return -1
-    if (matches.length === 1) return matches[0]
-
-    // Multiple matches - pick closest to current selection
-    if (currentIdx >= 0) {
-      return matches.reduce((best, idx) =>
-        Math.abs(idx - currentIdx) < Math.abs(best - currentIdx) ? idx : best
-      )
-    }
-    return matches[0]
-  },
-
-  getCoordPath (state, idx) {
-    const feature = this.getFeature(state.featureId)
-    if (!feature) return '0'
-
-    const segments = getRingSegments(feature)
-    const result = getSegmentForIndex(segments, idx)
-    if (!result) return '0'
-
-    const { segment, localIdx } = result
-    return [...segment.path, localIdx].join('.')
-  },
-
-  syncVertices (state) {
-    state.vertecies = this.getVerticies(state.featureId)
-    state.midpoints = this.getMidpoints(state.featureId)
-  },
-
-  getVerticies (featureId) {
-    return getCoords(this.getFeature(featureId)) || []
-  },
-
-  getMidpoints (featureId) {
-    const feature = this.getFeature(featureId)
-    const coords = getCoords(feature)
-    const segments = getRingSegments(feature)
-    if (!coords?.length || !segments.length) {
-      return []
-    }
-
-    const midpoints = []
-    // Create midpoints within each segment, respecting boundaries
-    for (const seg of segments) {
-      // For closed rings, create midpoint between every vertex including last→first
-      // For open lines, create midpoints only between consecutive vertices (no wrap-around)
-      const count = seg.closed ? seg.length : seg.length - 1
-      for (let i = 0; i < count; i++) {
-        const idx = seg.start + i
-        const nextIdx = seg.start + ((i + 1) % seg.length)
-        const [x1, y1] = coords[idx]
-        const [x2, y2] = coords[nextIdx]
-        midpoints.push([(x1 + x2) / 2, (y1 + y2) / 2])
-      }
-    }
-    return midpoints
-  },
-
-  getVertexOrMidpoint (state, direction) {
-    // Ensure vertices and midpoints are populated
-    if (!state.vertecies?.length) {
-      state.vertecies = this.getVerticies(state.featureId)
-      state.midpoints = this.getMidpoints(state.featureId)
-    }
-    if (!state.vertecies?.length) {
-      return [-1, null]
-    }
-    const project = (p) => p ? Object.values(this.map.project(p)) : null
-    const pixels = [...state.vertecies.map(project), ...state.midpoints.map(project)].filter(Boolean)
-    if (!pixels.length) {
-      return [-1, null]
-    }
-    const start = pixels[state.selectedVertexIndex] || Object.values(this.map.project(this.map.getCenter()))
-    const idx = spatialNavigate(start, pixels, direction)
-    return [idx, idx < state.vertecies.length ? 'vertex' : 'midpoint']
-  },
-
-  getVertexIndexFromMidpoint (state, coordPath) {
-    const feature = this.getFeature(state.featureId)
-    const segments = getRingSegments(feature)
-    const parts = coordPath.split('.').map(Number)
-
-    // Find which segment this coord_path belongs to
-    let midpointOffset = 0
-    for (const seg of segments) {
-      const pathMatches = seg.path.every((val, idx) => val === parts[idx])
-      if (pathMatches && parts.length === seg.path.length + 1) {
-        // In DirectSelect, midpoint coord_path represents the insertion index
-        // The midpoint between vertex N and N+1 has coord_path ending in N+1
-        // So our flat midpoint index is one less than the coord_path index
-        const insertionIdx = parts[parts.length - 1]
-        const localMidpointIdx = insertionIdx > 0 ? insertionIdx - 1 : seg.length - 2
-        // Midpoints are indexed after all vertices
-        return state.vertecies.length + midpointOffset + localMidpointIdx
-      }
-      // Count midpoints in this segment (must match getMidpoints calculation)
-      const segMidpoints = seg.closed ? seg.length : seg.length - 1
-      midpointOffset += segMidpoints
-    }
-
-    // Fallback
-    return state.vertecies.length
-  }
-}
diff --git a/plugins/beta/draw-ml/src/modes/editVertexMode.js b/plugins/beta/draw-ml/src/modes/editVertexMode.js
deleted file mode 100755
index 86527a913..000000000
--- a/plugins/beta/draw-ml/src/modes/editVertexMode.js
+++ /dev/null
@@ -1,495 +0,0 @@
-import DirectSelect from '../../../../../node_modules/@mapbox/mapbox-gl-draw/src/modes/direct_select.js' // NOSONAR
-import {
-  getSnapInstance, isSnapActive, isSnapEnabled, getSnapLngLat,
-  getSnapRadius, triggerSnapAtPoint, clearSnapIndicator, clearSnapState
-} from '../utils/snapHelpers.js'
-import { getCoords, coordPathToFlatIndex } from './editVertex/geometryHelpers.js'
-import { scalePoint } from './editVertex/helpers.js'
-import { undoHandlers } from './editVertex/undoHandlers.js'
-import { touchHandlers } from './editVertex/touchHandlers.js'
-import { vertexOperations } from './editVertex/vertexOperations.js'
-import { vertexQueries } from './editVertex/vertexQueries.js'
-
-const ARROW_KEYS = new Set(['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'])
-const ARROW_OFFSETS = { ArrowUp: [0, -1], ArrowDown: [0, 1], ArrowLeft: [-1, 0], ArrowRight: [1, 0] }
-
-export const EditVertexMode = {
-  ...DirectSelect,
-  ...undoHandlers,
-  ...touchHandlers,
-  ...vertexOperations,
-  ...vertexQueries,
-
-  onSetup (options) {
-    const state = DirectSelect.onSetup.call(this, options)
-    Object.assign(state, {
-      container: options.container,
-      interfaceType: options.interfaceType,
-      deleteVertexButtonId: options.deleteVertexButtonId,
-      undoButtonId: options.undoButtonId,
-      isPanEnabled: options.isPanEnabled,
-      getSnapEnabled: options.getSnapEnabled,
-      featureId: state.featureId || options.featureId,
-      selectedVertexIndex: options.selectedVertexIndex ?? -1,
-      selectedVertexType: options.selectedVertexType,
-      coordPath: options.coordPath,
-      scale: options.scale ?? 1
-    })
-
-    // Get feature type for later reference
-    const feature = this.getFeature(state.featureId)
-    state.featureType = feature?.type
-
-    state.vertecies = this.getVerticies(state.featureId)
-    state.midpoints = this.getMidpoints(state.featureId)
-    this.setupEventListeners(state)
-
-    this.applyVertexSelection(state, options)
-    this.map._drawEditContainer = options.container
-    this.addTouchVertexTarget(state)
-
-    // Clear any snap indicator when entering edit mode
-    const snap = getSnapInstance(this.map)
-    if (snap) {
-      clearSnapIndicator(snap, this.map)
-    }
-
-    // Show touch target if entering with a selected vertex on touch interface
-    if (state.interfaceType === 'touch' && state.selectedVertexIndex >= 0 && state.selectedVertexType === 'vertex') {
-      const vertex = state.vertecies[state.selectedVertexIndex]
-      if (vertex) {
-        setTimeout(() => {
-          this.updateTouchVertexTarget(state, scalePoint(this.map.project(vertex), state.scale))
-        }, 0)
-      }
-    }
-
-    // Ignore pointermove deselection briefly after setup to let Safari settle
-    state._ignorePointermoveDeselect = true
-    setTimeout(() => { state._ignorePointermoveDeselect = false }, 100)
-
-    return state
-  },
-
-  setupEventListeners (state) {
-    const bind = (fn) => (e) => fn.call(this, state, e)
-    const h = this.handlers = {
-      keydown: bind(this.onKeydown),
-      keyup: bind(this.onKeyup),
-      pointerdown: bind(this.onPointerevent),
-      pointermove: bind(this.onPointerevent),
-      pointerup: bind(this.onPointerevent),
-      click: bind(this.onButtonClick),
-      touchstart: bind(this.onTouchstart),
-      touchmove: bind(this.onTouchmove),
-      touchend: bind(this.onTouchend),
-      selectionchange: bind(this.onSelectionChange),
-      scalechange: bind(this.onScaleChange),
-      update: bind(this.onUpdate),
-      move: bind(this.onMove),
-      interfacetypechange: bind(this.onInterfaceTypeChange)
-    }
-
-    window.addEventListener('keydown', h.keydown, { capture: true })
-    window.addEventListener('keyup', h.keyup, { capture: true })
-    window.addEventListener('click', h.click)
-    state.container.addEventListener('pointerdown', h.pointerdown)
-    state.container.addEventListener('pointermove', h.pointermove)
-    state.container.addEventListener('pointerup', h.pointerup)
-    state.container.addEventListener('touchstart', h.touchstart, { passive: false })
-    state.container.addEventListener('touchmove', h.touchmove, { passive: false })
-    state.container.addEventListener('touchend', h.touchend, { passive: false })
-    this.map.on('draw.selectionchange', h.selectionchange)
-    this.map.on('draw.scalechange', h.scalechange)
-    this.map.on('draw.update', h.update)
-    this.map.on('move', h.move)
-    this.map.on('draw.interfacetypechange', h.interfacetypechange)
-  },
-
-  applyVertexSelection (state, options) {
-    if (options.selectedVertexType === 'midpoint') {
-      state.selectedCoordPaths = []
-      this.clearSelectedCoordinates()
-      if (state.feature) { state.feature.changed() }
-      this._ctx.store.render()
-      this.updateMidpoint(state.midpoints[options.selectedVertexIndex - state.vertecies.length])
-      return
-    }
-    if (options.selectedVertexIndex === -1) {
-      state.selectedCoordPaths = []
-      this.clearSelectedCoordinates()
-      if (state.feature) { state.feature.changed() }
-      this._ctx.store.render()
-    }
-  },
-
-  onSelectionChange (state, e) {
-    // Refresh vertex list so numVertecies reflects the latest geometry (e.g. after midpoint insertion)
-    this.syncVertices(state)
-
-    const vertexCoord = e.points[e.points.length - 1]?.geometry.coordinates
-
-    // Only update selectedVertexIndex from event if not keyboard mode AND event has valid vertex
-    // For keyboard mode or when we have coordPath, trust the existing selectedVertexIndex
-    if (state.interfaceType !== 'keyboard' && vertexCoord && !state.coordPath) {
-      // No coordPath available - need to search for vertex by coordinates
-      const geom = e.features[0]?.geometry
-      const coords = getCoords(geom)
-      state.selectedVertexIndex = this.findVertexIndex(coords, vertexCoord, state.selectedVertexIndex)
-    }
-    // If we have coordPath, selectedVertexIndex is already correct from onTap/changeMode
-
-    state.selectedVertexType ??= state.selectedVertexIndex >= 0 ? 'vertex' : null
-
-    this.map.fire('draw.vertexselection', {
-      index: state.selectedVertexType === 'vertex' ? state.selectedVertexIndex : -1,
-      numVertecies: state.vertecies.length
-    })
-
-    // Use vertex from event if available, otherwise fall back to state
-    const vertex = vertexCoord || (state.selectedVertexIndex >= 0 ? state.vertecies[state.selectedVertexIndex] : null)
-    this.updateTouchVertexTarget(state, vertex ? scalePoint(this.map.project(vertex), state.scale) : null)
-  },
-
-  onScaleChange (state, e) {
-    state.scale = e.scale
-  },
-
-  onInterfaceTypeChange (state, e) {
-    state.interfaceType = e.interfaceType
-    const vertex = state.selectedVertexIndex >= 0 ? state.vertecies[state.selectedVertexIndex] : null
-    this.updateTouchVertexTarget(state, vertex ? scalePoint(this.map.project(vertex), state.scale) : null)
-  },
-
-  onUpdate (state) {
-    const prev = new Set(state.vertecies.map(c => JSON.stringify(c)))
-    if (prev.size === state.vertecies.length) {
-      return
-    }
-    state.selectedVertexIndex = state.vertecies.findIndex(c => !prev.has(JSON.stringify(c)))
-    state.selectedVertexType ??= state.selectedVertexIndex >= 0 ? 'vertex' : null
-  },
-
-  onKeydown (state, e) {
-    if (!state.container.contains(document.activeElement)) {
-      return
-    }
-
-    state.interfaceType = 'keyboard'
-    this.hideTouchVertexIndicator(state)
-
-    if (e.key === ' ') {
-      e.preventDefault()
-    }
-
-    if (e.key === ' ' && state.selectedVertexIndex < 0) {
-      // Clear snap indicator when starting keyboard selection
-      const snap = getSnapInstance(this.map)
-      if (snap) {
-        clearSnapIndicator(snap, this.map)
-      }
-
-      // Ensure we have vertices to select
-      if (!state.vertecies?.length) {
-        state.vertecies = this.getVerticies(state.featureId)
-        state.midpoints = this.getMidpoints(state.featureId)
-      }
-      if (!state.vertecies?.length) {
-        return
-      }
-      state.isPanEnabled = false
-      return this.updateVertex(state)
-    }
-
-    if (!e.altKey && ARROW_KEYS.has(e.key) && state.selectedVertexIndex >= 0) {
-      e.preventDefault()
-      e.stopPropagation()
-      if (state.selectedVertexType === 'midpoint') {
-        return this.insertVertex(state, e)
-      }
-
-      const snap = getSnapInstance(this.map)
-      const feature = this.getFeature(state.featureId)
-      if (!feature) {
-        return
-      }
-      const coords = getCoords(feature)
-      const currentCoord = coords?.[state.selectedVertexIndex]
-      if (!currentCoord) {
-        return
-      }
-
-      // Save starting position for undo (only on first move of sequence)
-      if (!state._keyboardMoveStartPosition) {
-        state._keyboardMoveStartPosition = [...currentCoord]
-        state._keyboardMoveStartIndex = state.selectedVertexIndex
-      }
-
-      // Break out of snap by moving outside snap radius
-      if (isSnapEnabled(state) && state._isSnapped && snap) {
-        const offset = getSnapRadius(snap) + 1
-        const pt = this.map.project(currentCoord)
-        const [dx, dy] = ARROW_OFFSETS[e.key].map(v => v * offset)
-        state._isSnapped = false
-        clearSnapIndicator(snap, this.map)
-        return this.moveVertex(state, this.map.unproject({ x: pt.x + dx, y: pt.y + dy }))
-      }
-
-      const newCoord = this.getNewCoord(state, e)
-      if (isSnapEnabled(state) && snap) {
-        triggerSnapAtPoint(snap, this.map, this.map.project(newCoord))
-        if (isSnapActive(snap)) {
-          state._isSnapped = true
-          return this.moveVertex(state, getSnapLngLat(snap))
-        }
-      }
-      state._isSnapped = false
-      return this.moveVertex(state, newCoord)
-    }
-
-    if (e.altKey && ARROW_KEYS.has(e.key) && state.selectedVertexIndex >= 0) {
-      e.preventDefault()
-      e.stopPropagation()
-      return this.updateVertex(state, e.key)
-    }
-
-    if (e.key === 'Escape') {
-      this.changeMode(state, { isPanEnabled: true, selectedVertexIndex: -1, selectedVertexType: null })
-    }
-
-    // Undo with Cmd/Ctrl+Z (works without viewport focus, but not in input fields)
-    if (e.key === 'z' && (e.metaKey || e.ctrlKey) && !e.shiftKey) {
-      const tag = document.activeElement?.tagName
-      if (tag === 'INPUT' || tag === 'TEXTAREA') {
-        return
-      }
-      e.preventDefault()
-      e.stopPropagation()
-      return this.handleUndo(state)
-    }
-  },
-
-  onKeyup (state, e) {
-    if (!state.container.contains(document.activeElement)) {
-      return
-    }
-
-    state.interfaceType = 'keyboard'
-    if (ARROW_KEYS.has(e.key) && state.selectedVertexIndex >= 0) {
-      e.stopPropagation()
-
-      // Push undo for keyboard move sequence
-      if (state._keyboardMoveStartPosition && state._keyboardMoveStartIndex !== undefined) {
-        this.pushUndo({
-          type: 'move_vertex',
-          featureId: state.featureId,
-          vertexIndex: state._keyboardMoveStartIndex,
-          previousPosition: state._keyboardMoveStartPosition
-        })
-        state._keyboardMoveStartPosition = null
-        state._keyboardMoveStartIndex = undefined
-      }
-    }
-    if (e.key === 'Delete') {
-      this.deleteVertex(state)
-    }
-  },
-
-  onMouseDown (state, e) {
-    clearSnapState(getSnapInstance(this.map))
-    const meta = e.featureTarget?.properties.meta
-    const coordPath = e.featureTarget?.properties.coord_path
-
-    if (['vertex', 'midpoint'].includes(meta)) {
-      state.dragMoveLocation = e.lngLat
-      state.dragMoving = false
-      DirectSelect.onMouseDown.call(this, state, e)
-
-      // Update selection state for vertex clicks (so onSelectionChange has correct context)
-      if (meta === 'vertex' && coordPath) {
-        const feature = this.getFeature(state.featureId)
-        const vertexIndex = coordPathToFlatIndex(feature, coordPath)
-        state.selectedVertexIndex = vertexIndex
-        state.selectedVertexType = 'vertex'
-        state.coordPath = coordPath
-        const vertex = state.vertecies?.[vertexIndex]
-        if (vertex) {
-          state._moveStartPosition = [...vertex]
-          state._moveStartIndex = vertexIndex
-        }
-      }
-    }
-    if (meta === 'midpoint') {
-      // DirectSelect converts midpoint to vertex - track this as an insert
-      const feature = this.getFeature(state.featureId)
-      const insertedIndex = coordPathToFlatIndex(feature, coordPath)
-
-      // Track this insertion for undo (will be pushed on mouseUp if drag occurred)
-      state._insertedVertexIndex = insertedIndex
-      state._isInsertingVertex = true
-
-      state.selectedVertexIndex = this.getVertexIndexFromMidpoint(state, coordPath)
-      state.selectedVertexType = 'vertex'
-      state.coordPath = null // Clear coordPath for midpoints
-      this.map.fire('draw.vertexselection', { index: state.selectedVertexIndex, numVertecies: state.vertecies.length })
-    }
-  },
-
-  onClick (state, e) { // NOSONAR — complexity accumulated from object-level context; single guard clause, see feedback_mgl_click_vs_mouseup.md
-    if (state._isInsertingVertex && state._insertedVertexIndex !== undefined) {
-      const insertedIndex = state._insertedVertexIndex
-      this.syncVertices(state)
-      this.pushUndo({ type: 'insert_vertex', featureId: state.featureId, vertexIndex: insertedIndex })
-      state.selectedVertexIndex = insertedIndex
-      state.selectedVertexType = 'vertex'
-      state._isInsertingVertex = false
-      state._insertedVertexIndex = undefined
-      this.map.fire('draw.vertexselection', { index: insertedIndex, numVertecies: state.vertecies.length })
-      return
-    }
-    DirectSelect.onClick.call(this, state, e)
-  },
-
-  onMouseUp (state, e) {
-    clearSnapState(getSnapInstance(this.map))
-
-    // Check if vertex actually moved by comparing current position to start position
-    // This is more robust than relying on state.dragMoving which can be inconsistent
-    // IMPORTANT: Get current position from the feature, not state.vertecies (which is cached)
-    let vertexMoved = false
-    if (state._moveStartPosition && state._moveStartIndex !== undefined) {
-      const feature = this.getFeature(state.featureId)
-      if (feature) {
-        const currentVertex = getCoords(feature)?.[state._moveStartIndex]
-        if (currentVertex) {
-          vertexMoved = currentVertex[0] !== state._moveStartPosition[0] ||
-                        currentVertex[1] !== state._moveStartPosition[1]
-        }
-      }
-    }
-
-    // Also check for insertions (dragMoving is reliable for midpoint drags)
-    const wasInsertion = state._isInsertingVertex && state._insertedVertexIndex !== undefined
-
-    if (state.dragMoving || vertexMoved || wasInsertion) {
-      this.syncVertices(state)
-
-      // Push undo for vertex insertion (from dragging midpoint)
-      if (wasInsertion) {
-        const insertedIndex = state._insertedVertexIndex
-        this.pushUndo({
-          type: 'insert_vertex',
-          featureId: state.featureId,
-          vertexIndex: insertedIndex
-        })
-        // selectedVertexIndex was pointing to the old midpoint-range index;
-        // update it to the actual flat index of the newly inserted vertex
-        state.selectedVertexIndex = insertedIndex
-        state.selectedVertexType = 'vertex'
-        state._isInsertingVertex = false
-        state._insertedVertexIndex = undefined
-        // Broadcast the updated vertex count — DirectSelect.onMouseUp only fires
-        // draw.update (not draw.selectionchange), so onSelectionChange never runs
-        this.map.fire('draw.vertexselection', {
-          index: insertedIndex, numVertecies: state.vertecies.length
-        })
-      } else if (vertexMoved && state._moveStartPosition && state._moveStartIndex !== undefined) {
-        // Push undo for the move if vertex actually moved
-        this.pushUndo({
-          type: 'move_vertex',
-          featureId: state.featureId,
-          vertexIndex: state._moveStartIndex,
-          previousPosition: state._moveStartPosition
-        })
-      } else {
-        // No action
-      }
-    }
-
-    // Clean up move state
-    state._moveStartPosition = null
-    state._moveStartIndex = null
-
-    DirectSelect.onMouseUp.call(this, state, e)
-  },
-
-  onDrag (state, e) {
-    if (state.interfaceType === 'touch') {
-      return
-    }
-
-    this.map.fire('draw.geometrychange', state.feature)
-
-    const snap = getSnapInstance(this.map)
-    if (snap) {
-      snap.snapStatus = false
-      snap.snapCoords = null
-    }
-
-    if (!isSnapEnabled(state) || !snap?.status) {
-      DirectSelect.onDrag.call(this, state, e)
-      return
-    }
-
-    if (!state.selectedCoordPaths?.length || !state.canDragMove) {
-      return
-    }
-
-    state.dragMoving = true
-    e.originalEvent.stopPropagation()
-    triggerSnapAtPoint(snap, this.map, e.point)
-
-    const finalLngLat = getSnapLngLat(snap) || e.lngLat
-    state.feature.updateCoordinate(state.selectedCoordPaths[0], finalLngLat.lng, finalLngLat.lat)
-    state.dragMoveLocation = e.lngLat
-  },
-
-  onMove (state) {
-    const vertex = state.vertecies[state.selectedVertexIndex]
-    if (vertex) {
-      this.updateTouchVertexTarget(state, scalePoint(this.map.project(vertex), state.scale))
-    }
-  },
-
-  onButtonClick (state, e) {
-    if (e.target.closest(`#${state.deleteVertexButtonId}`) && state.selectedVertexType === 'vertex') {
-      this.deleteVertex(state)
-    }
-    if (e.target.closest(`#${state.undoButtonId}`)) {
-      this.handleUndo(state)
-    }
-  },
-
-  clickNoTarget (state) {
-    this.changeMode(state, { selectedVertexIndex: -1, selectedVertexType: null, isPanEnabled: true })
-  },
-
-  // Prevent selecting other features
-  changeMode (state, updates) {
-    if (!state.featureId) {
-      return
-    }
-    this._ctx.api.changeMode('edit_vertex', { ...state, ...updates })
-  },
-
-  onStop (state) {
-    this.map._drawEditContainer = null
-    const h = this.handlers
-    state.container.removeEventListener('pointerdown', h.pointerdown)
-    state.container.removeEventListener('pointermove', h.pointermove)
-    state.container.removeEventListener('pointerup', h.pointerup)
-    state.container.removeEventListener('touchstart', h.touchstart)
-    state.container.removeEventListener('touchmove', h.touchmove)
-    state.container.removeEventListener('touchend', h.touchend)
-    this.map.off('draw.selectionchange', h.selectionchange)
-    this.map.off('draw.scalechange', h.scalechange)
-    this.map.off('draw.update', h.update)
-    this.map.off('move', h.move)
-    this.map.off('draw.interfacetypechange', h.interfacetypechange)
-    this.map.dragPan.enable()
-    window.removeEventListener('click', h.click)
-    window.removeEventListener('keydown', h.keydown, { capture: true })
-    window.removeEventListener('keyup', h.keyup, { capture: true })
-    this.hideTouchVertexIndicator(state)
-  }
-}
diff --git a/plugins/beta/draw-ml/src/reducer.js b/plugins/beta/draw-ml/src/reducer.js
deleted file mode 100755
index 9497306fd..000000000
--- a/plugins/beta/draw-ml/src/reducer.js
+++ /dev/null
@@ -1,90 +0,0 @@
-const initialState = {
-  mode: null,
-  action: null, // 'split | merge'
-  actionValid: false, // eg. a valid split line for a target feature
-  feature: null,
-  tempFeature: null,
-  selectedVertexIndex: -1,
-  numVertecies: null,
-  snap: false,
-  hasSnapLayers: false,
-  undoStackLength: 0
-}
-
-const DRAW_MODES = new Set(['draw_polygon', 'draw_line'])
-
-const setMode = (state, payload) => {
-  return {
-    ...state,
-    mode: payload,
-    numVertecies: DRAW_MODES.has(payload) ? 0 : state.numVertecies
-  }
-}
-
-const setAction = (state, payload) => {
-  return {
-    ...state,
-    action: payload.name,
-    actionValid: payload.isValid
-  }
-}
-
-const setSelectedVertexIndex = (state, payload) => {
-  return {
-    ...state,
-    selectedVertexIndex: payload.index,
-    numVertecies: payload.numVertecies
-  }
-}
-
-const setFeature = (state, payload) => {
-  return {
-    ...state,
-    feature: payload.feature === undefined ? state.feature : payload.feature,
-    tempFeature: payload.tempFeature === undefined ? state.tempFeature : payload.tempFeature
-  }
-}
-
-const toggleSnap = (state) => {
-  return {
-    ...state,
-    snap: !state.snap
-  }
-}
-
-const setSnap = (state, payload) => {
-  return {
-    ...state,
-    snap: !!payload
-  }
-}
-
-const setHasSnapLayers = (state, payload) => {
-  return {
-    ...state,
-    hasSnapLayers: !!payload
-  }
-}
-
-const setUndoStackLength = (state, payload) => {
-  return {
-    ...state,
-    undoStackLength: payload
-  }
-}
-
-const actions = {
-  SET_MODE: setMode,
-  SET_ACTION: setAction,
-  SET_FEATURE: setFeature,
-  SET_SELECTED_VERTEX_INDEX: setSelectedVertexIndex,
-  TOGGLE_SNAP: toggleSnap,
-  SET_SNAP: setSnap,
-  SET_HAS_SNAP_LAYERS: setHasSnapLayers,
-  SET_UNDO_STACK_LENGTH: setUndoStackLength
-}
-
-export {
-  initialState,
-  actions
-}
diff --git a/plugins/beta/draw-ml/src/styles.js b/plugins/beta/draw-ml/src/styles.js
deleted file mode 100755
index eaad6faf2..000000000
--- a/plugins/beta/draw-ml/src/styles.js
+++ /dev/null
@@ -1,190 +0,0 @@
-// styles.js
-import { DEFAULTS } from './defaults.js'
-
-const getColorScheme = (mapStyle) => mapStyle.mapColorScheme ?? 'light'
-
-const getUserProp = (mapStyle, prop, defaultsKey = prop) => [
-  'coalesce',
-  ['get', `user_${prop}${mapStyle.id.charAt(0).toUpperCase() + mapStyle.id.slice(1)}`],
-  ['get', `user_${prop}`],
-  DEFAULTS[defaultsKey]
-]
-
-// Inactive lines and fills
-const fillInactive = (mapStyle) => ({
-  id: 'fill-inactive',
-  type: 'fill',
-  filter: ['all', ['==', '$type', 'Polygon'], ['==', 'active', 'false']],
-  paint: { 'fill-color': getUserProp(mapStyle, 'fill', 'shapeFill') }
-})
-
-const strokeInactive = (mapStyle) => ({
-  id: 'stroke-inactive',
-  type: 'line',
-  filter: ['all', ['any', ['==', '$type', 'Polygon'], ['==', '$type', 'LineString']], ['==', 'active', 'false'], ['!has', 'user_splitter']],
-  layout: { 'line-cap': 'round', 'line-join': 'round' },
-  paint: {
-    'line-color': getUserProp(mapStyle, 'stroke', 'shapeStroke'),
-    'line-width': getUserProp(mapStyle, 'strokeWidth')
-  }
-})
-
-// Active lines and fills
-const fillActive = (editStrokeColor) => ({
-  id: 'fill-active',
-  type: 'fill',
-  filter: ['all', ['==', '$type', 'Polygon'], ['==', 'active', 'true']],
-  paint: { 'fill-color': editStrokeColor, 'fill-opacity': 0.1 }
-})
-
-const strokeActive = (editStrokeColor) => ({
-  id: 'stroke-active',
-  type: 'line',
-  filter: ['all', ['any', ['==', '$type', 'Polygon'], ['==', '$type', 'LineString']], ['==', 'active', 'true'], ['!has', 'user_splitter']],
-  layout: { 'line-cap': 'round', 'line-join': 'round' },
-  paint: { 'line-color': editStrokeColor, 'line-width': 2, 'line-opacity': 1 }
-})
-
-// Splitter line
-const drawInvalidSplitter = (splitInvalidColor) => ({
-  id: 'stroke-invalid-splitter',
-  type: 'line',
-  filter: ['all', ['==', '$type', 'LineString'], ['==', 'active', 'true'], ['==', 'user_splitter', 'invalid']],
-  layout: { 'line-cap': 'round', 'line-join': 'round' },
-  paint: {
-    'line-color': splitInvalidColor,
-    'line-width': 2,
-    'line-dasharray': [0.2, 2],
-    'line-opacity': 1
-  }
-})
-
-const drawValidSplitter = (splitValidColor) => ({
-  id: 'stroke-valid-splitter',
-  type: 'line',
-  filter: ['all', ['==', '$type', 'LineString'], ['==', 'active', 'true'], ['==', 'user_splitter', 'valid']],
-  layout: { 'line-cap': 'round', 'line-join': 'round' },
-  paint: {
-    'line-color': splitValidColor,
-    'line-width': 2,
-    'line-opacity': 1
-  }
-})
-
-// Dashed preview line
-const drawPreviewLine = (editStrokeColor) => ({
-  id: 'stroke-preview-line',
-  type: 'line',
-  filter: ['all', ['==', '$type', 'LineString'], ['==', 'active', 'true'], ['!has', 'user_splitter']],
-  layout: { 'line-cap': 'round', 'line-join': 'round' },
-  paint: { 'line-color': editStrokeColor, 'line-width': 2, 'line-dasharray': [0.2, 2], 'line-opacity': 1 }
-})
-
-// Vertex layers
-const vertex = (editVertexColor) => ({
-  id: 'vertex',
-  type: 'circle',
-  filter: ['all', ['==', '$type', 'Point'], ['==', 'meta', 'vertex']],
-  paint: { 'circle-radius': 6, 'circle-color': editVertexColor }
-})
-
-const vertexHalo = (editHaloColor, editActiveColor) => ({
-  id: 'vertex-halo',
-  type: 'circle',
-  filter: ['all', ['==', '$type', 'Point'], ['==', 'meta', 'vertex'], ['==', 'active', 'true']],
-  paint: { 'circle-radius': 8, 'circle-stroke-width': 3, 'circle-color': editHaloColor, 'circle-stroke-color': editActiveColor }
-})
-
-const vertexActive = (editVertexColor) => ({
-  id: 'vertex-active',
-  type: 'circle',
-  filter: ['all', ['==', '$type', 'Point'], ['==', 'meta', 'vertex'], ['==', 'active', 'true']],
-  paint: { 'circle-radius': 6, 'circle-color': editVertexColor }
-})
-
-// Midpoints
-const midpoint = (editMidpointColor) => ({
-  id: 'midpoint',
-  type: 'circle',
-  filter: ['all', ['==', '$type', 'Point'], ['==', 'meta', 'midpoint']],
-  paint: { 'circle-radius': 4, 'circle-color': editMidpointColor }
-})
-
-const midpointHalo = (editHaloColor, editActiveColor) => ({
-  id: 'midpoint-halo',
-  type: 'circle',
-  filter: ['all', ['==', '$type', 'Point'], ['==', 'meta', 'midpoint'], ['==', 'active', 'true']],
-  paint: { 'circle-radius': 6, 'circle-stroke-width': 3, 'circle-color': editHaloColor, 'circle-stroke-color': editActiveColor }
-})
-
-const midpointActive = (editMidpointColor) => ({
-  id: 'midpoint-active',
-  type: 'circle',
-  filter: ['all', ['==', '$type', 'Point'], ['==', 'meta', 'midpoint'], ['==', 'active', 'true']],
-  paint: { 'circle-radius': 4, 'circle-color': editMidpointColor }
-})
-
-const circle = (editStrokeColor) => ({
-  id: 'circle',
-  type: 'line',
-  filter: ['==', 'id', 'circle'],
-  paint: { 'line-color': editStrokeColor, 'line-width': 2, 'line-opacity': 0.8 }
-})
-
-const touchVertexIndicator = () => ({
-  id: 'touch-vertex-indicator',
-  type: 'circle',
-  filter: ['all', ['==', '$type', 'Point'], ['==', 'meta', 'touch-vertex-indicator']],
-  paint: { 'circle-radius': 30, 'circle-color': '#3bb2d0', 'circle-stroke-width': 3, 'circle-stroke-color': '#ffffff', 'circle-opacity': 0.9 }
-})
-
-const createDrawStyles = (mapStyle) => {
-  const scheme = getColorScheme(mapStyle)
-  const editStrokeColor = DEFAULTS.editStroke[scheme]
-  const editVertexColor = DEFAULTS.editVertex[scheme]
-  const editMidpointColor = DEFAULTS.editMidpoint[scheme]
-  const editHaloColor = DEFAULTS.editHalo[scheme]
-  const editActiveColor = DEFAULTS.editActive[scheme]
-  const splitInvalidColor = DEFAULTS.splitInvalid[scheme]
-  const splitValidColor = DEFAULTS.splitValid[scheme]
-
-  return [
-    fillInactive(mapStyle),
-    fillActive(editStrokeColor),
-    strokeActive(editStrokeColor),
-    strokeInactive(mapStyle),
-    drawInvalidSplitter(splitInvalidColor),
-    drawValidSplitter(splitValidColor),
-    drawPreviewLine(editStrokeColor),
-    midpoint(editMidpointColor),
-    midpointHalo(editHaloColor, editActiveColor),
-    midpointActive(editMidpointColor),
-    vertex(editVertexColor),
-    vertexHalo(editHaloColor, editActiveColor),
-    vertexActive(editVertexColor),
-    circle(editStrokeColor),
-    touchVertexIndicator()
-  ]
-}
-
-/**
- * Helper to iterate over a MapLibre map and apply new paint properties
- */
-const updateDrawStyles = (map, mapStyle) => {
-  const layers = createDrawStyles(mapStyle)
-  layers.forEach(layer => {
-    Object.entries(layer.paint).forEach(([prop, value]) => {
-      if (map.getLayer(`${layer.id}.cold`)) {
-        map.setPaintProperty(`${layer.id}.cold`, prop, value)
-      }
-      if (map.getLayer(`${layer.id}.hot`)) {
-        map.setPaintProperty(`${layer.id}.hot`, prop, value)
-      }
-    })
-  })
-}
-
-export {
-  createDrawStyles,
-  updateDrawStyles
-}
diff --git a/plugins/beta/draw-ml/src/undoStack.js b/plugins/beta/draw-ml/src/undoStack.js
deleted file mode 100644
index 18b3525c9..000000000
--- a/plugins/beta/draw-ml/src/undoStack.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Creates an undo stack manager for draw operations.
- * Fires 'draw.undochange' events when stack changes for UI updates.
- *
- * @param {Object} map - MapLibre map instance
- * @returns {Object} Undo stack manager
- */
-export const createUndoStack = (map) => {
-  const stack = []
-
-  const fireChange = () => {
-    map.fire('draw.undochange', { length: stack.length })
-  }
-
-  return {
-    /**
-     * Push an undo operation onto the stack
-     * @param {Object} operation - { type, undo: Function, ...data }
-     */
-    push (operation) {
-      stack.push(operation)
-      fireChange()
-    },
-
-    /**
-     * Pop and return the last operation (does not execute it)
-     * @returns {Object|undefined} The operation or undefined if empty
-     */
-    pop () {
-      const op = stack.pop()
-      fireChange()
-      return op
-    },
-
-    /**
-     * Clear all operations from the stack
-     */
-    clear () {
-      stack.length = 0
-      fireChange()
-    },
-
-    /**
-     * Get current stack length
-     */
-    get length () {
-      return stack.length
-    }
-  }
-}
diff --git a/plugins/beta/draw-ml/src/utils/debounce.js b/plugins/beta/draw-ml/src/utils/debounce.js
deleted file mode 100644
index 0e480ff6d..000000000
--- a/plugins/beta/draw-ml/src/utils/debounce.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// --- Debounce Helper ---
-export const debounce = (fn, delay) => {
-  let timeout
-
-  const debounced = (...args) => {
-    clearTimeout(timeout)
-    timeout = setTimeout(() => fn(...args), delay)
-  }
-
-  debounced.cancel = () => {
-    clearTimeout(timeout)
-    timeout = null
-  }
-
-  return debounced
-}
diff --git a/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js b/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js
deleted file mode 100644
index 70f85807d..000000000
--- a/plugins/beta/draw-ml/src/utils/flattenStyleProperties.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const STYLE_PROPS = ['stroke', 'fill', 'strokeWidth']
-
-/**
- * Flatten style properties that may be strings or variant objects
- * keyed by style ID into flat GeoJSON-compatible properties.
- *
- * @param {object} props - Object containing style properties
- * @returns {object} Flattened properties
- *
- * @example
- * flattenStyleProperties({
- *   stroke: { outdoor: '#e6c700', dark: '#ffd700' },
- *   fill: 'rgba(255, 221, 0, 0.1)',
- *   strokeWidth: 3
- * })
- * // Returns:
- * // {
- * //   stroke: '#e6c700',
- * //   strokeOutdoor: '#e6c700',
- * //   strokeDark: '#ffd700',
- * //   fill: 'rgba(255, 221, 0, 0.1)',
- * //   strokeWidth: 3
- * // }
- */
-export const flattenStyleProperties = (props) => {
-  if (!props) {
-    return {}
-  }
-
-  const result = {}
-
-  for (const [key, value] of Object.entries(props)) {
-    if (STYLE_PROPS.includes(key) && typeof value === 'object' && value !== null) {
-      const entries = Object.entries(value)
-      // First value as base fallback
-      if (entries.length > 0) {
-        result[key] = entries[0][1]
-      }
-      // Variant properties: e.g. strokeDark, fillOutdoor
-      for (const [styleId, styleValue] of entries) {
-        result[`${key}${styleId.charAt(0).toUpperCase() + styleId.slice(1)}`] = styleValue
-      }
-    } else {
-      result[key] = value
-    }
-  }
-
-  return result
-}
diff --git a/plugins/beta/draw-ml/src/utils/snapHelpers.js b/plugins/beta/draw-ml/src/utils/snapHelpers.js
deleted file mode 100644
index 03afdf796..000000000
--- a/plugins/beta/draw-ml/src/utils/snapHelpers.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Snap helper utilities for draw modes
- * Provides a consistent interface for snap detection and coordinate retrieval
- */
-
-/**
- * Get the snap instance from the map
- * @param {maplibregl.Map} map - Map instance
- * @returns {MapboxSnap|null} Snap instance or null
- */
-export function getSnapInstance (map) {
-  return map?._snapInstance ?? null
-}
-
-/**
- * Check if snapping is currently active
- * @param {MapboxSnap} snap - Snap instance
- * @returns {boolean} True if snap is active with valid coordinates
- */
-export function isSnapActive (snap) {
-  // Also check snap.status to ensure snap feature is enabled
-  return !!(snap?.status && snap?.snapStatus && snap.snapCoords?.length >= 2)
-}
-
-/**
- * Get snapped coordinates as lngLat object
- * @param {MapboxSnap} snap - Snap instance
- * @returns {{ lng: number, lat: number }|null} Snapped coordinates or null
- */
-export function getSnapLngLat (snap) {
-  if (!isSnapActive(snap)) {
-    return null
-  }
-  return {
-    lng: snap.snapCoords[0],
-    lat: snap.snapCoords[1]
-  }
-}
-
-/**
- * Get snapped coordinates as array [lng, lat]
- * @param {MapboxSnap} snap - Snap instance
- * @returns {[number, number]|null} Snapped coordinates or null
- */
-export function getSnapCoords (snap) {
-  if (!isSnapActive(snap)) {
-    return null
-  }
-  return [snap.snapCoords[0], snap.snapCoords[1]]
-}
-
-/**
- * Trigger snap detection at a given point
- * @param {MapboxSnap} snap - Snap instance
- * @param {maplibregl.Map} map - Map instance
- * @param {{ x: number, y: number }} point - Screen point
- * @returns {boolean} True if snap was triggered
- */
-export function triggerSnapAtPoint (snap, map, point) {
-  if (!snap || !map || !snap.status) {
-    return false
-  }
-
-  const lngLat = map.unproject(point)
-  snap.snapToClosestPoint({ point, lngLat })
-  return true
-}
-
-/**
- * Trigger snap detection at map center (for touch/keyboard modes)
- * @param {MapboxSnap} snap - Snap instance
- * @param {maplibregl.Map} map - Map instance
- * @returns {boolean} True if snap was triggered
- */
-export function triggerSnapAtCenter (snap, map) {
-  // Don't trigger snap if library is disabled
-  if (!snap || !map || !snap.status) {
-    return false
-  }
-
-  const center = map.getCenter()
-  const point = map.project(center)
-  snap.snapToClosestPoint({ point, lngLat: center })
-  return true
-}
-
-/**
- * Clear the snap indicator circle and all internal snap state
- * @param {MapboxSnap} snap - Snap instance
- * @param {maplibregl.Map} [map] - Optional map instance for direct layer control
- */
-export function clearSnapIndicator (snap, map) {
-  if (snap) {
-    snap.snapStatus = false
-    snap.snapCoords = null
-    // Clear arrays in place (avoids creating new objects, reduces GC pressure)
-    if (snap.snappedFeatures?.length) {
-      snap.snappedFeatures.length = 0
-    }
-    if (snap.closeFeatures?.length) {
-      snap.closeFeatures.length = 0
-    }
-    if (snap.lines?.length) {
-      snap.lines.length = 0
-    }
-    // Note: Avoid calling setMapData here - it's expensive in Safari
-  }
-
-  // Just hide the layer - much cheaper than setData() in Safari
-  if (map?.getLayer('snap-helper-circle')) {
-    map.setLayoutProperty('snap-helper-circle', 'visibility', 'none')
-  }
-}
-
-/**
- * Clear all snap state (for use between drag operations)
- * @param {MapboxSnap} snap - Snap instance
- */
-export function clearSnapState (snap) {
-  if (!snap) {
-    return
-  }
-  snap.snapStatus = false
-  snap.snapCoords = null
-  // Clear arrays in place (avoids creating new objects, reduces GC pressure)
-  if (snap.snappedFeatures?.length) {
-    snap.snappedFeatures.length = 0
-  }
-  if (snap.closeFeatures?.length) {
-    snap.closeFeatures.length = 0
-  }
-  if (snap.lines?.length) {
-    snap.lines.length = 0
-  }
-}
-
-/**
- * Get snap radius in pixels
- * @param {MapboxSnap} snap - Snap instance
- * @returns {number} Snap radius in pixels (default 15)
- */
-export function getSnapRadius (snap) {
-  return snap?.options?.radius ?? 15
-}
-
-/**
- * Check if snapping is enabled for a given state
- * @param {object} state - Mode state with optional getSnapEnabled function
- * @returns {boolean} True if snapping is enabled
- */
-export function isSnapEnabled (state) {
-  // Only return true if getSnapEnabled exists and explicitly returns true
-  if (typeof state?.getSnapEnabled !== 'function') {
-    return false
-  }
-  return state.getSnapEnabled() === true
-}
-
-/**
- * Create a synthetic map event with snapped coordinates
- * @param {object} e - Original event
- * @param {MapboxSnap} snap - Snap instance
- * @returns {object} Event with snapped lngLat or original event
- */
-export function createSnappedEvent (e, snap) {
-  const lngLat = getSnapLngLat(snap)
-  if (!lngLat) {
-    return e
-  }
-
-  return {
-    ...e,
-    lngLat
-  }
-}
-
-/**
- * Create a synthetic click event at snapped coordinates
- * @param {maplibregl.Map} map - Map instance
- * @param {MapboxSnap} snap - Snap instance
- * @returns {object|null} Synthetic event or null if no snap
- */
-export function createSnappedClickEvent (map, snap) {
-  const lngLat = getSnapLngLat(snap)
-  if (!lngLat) {
-    return null
-  }
-
-  const point = map.project([lngLat.lng, lngLat.lat])
-  return {
-    lngLat,
-    point,
-    originalEvent: new MouseEvent('click', {
-      clientX: point.x,
-      clientY: point.y,
-      bubbles: true,
-      cancelable: true
-    })
-  }
-}
diff --git a/plugins/beta/draw-ml/src/utils/spatial.js b/plugins/beta/draw-ml/src/utils/spatial.js
deleted file mode 100755
index 28939bb7d..000000000
--- a/plugins/beta/draw-ml/src/utils/spatial.js
+++ /dev/null
@@ -1,258 +0,0 @@
-import polygonSplitter from 'polygon-splitter'
-import turfBearing from '@turf/bearing'
-import turfDestination from '@turf/destination'
-import turfBooleanValid from '@turf/boolean-valid'
-import turfArea from '@turf/area'
-import {
-  featureCollection as turfFeatureCollection,
-  polygon as turfPolygon,
-  multiPolygon as turfMultiPolygon,
-  lineString as turfLineString,
-  multiLineString as turfMultiLineString,
-  point as turfPoint,
-  multiPoint as turfMultiPoint
-} from '@turf/helpers'
-
-/**
- * @typedef {import('geojson').Feature<import('geojson').Polygon>} Polygon
- * @typedef {import('geojson').Feature<import('geojson').LineString>} Line
- * @typedef {import('geojson').Feature<import('geojson').Feature>} Feature
- * @typedef {import('geojson').FeatureCollection<import('geojson').FeatureCollection>} FeatureCollection
- */
-
-/**
- * Extend a LineString at endpoints AND intermediate vertices.
- * For intermediate vertices on the polygon boundary, this creates small
- * extensions that ensure polygon-splitter recognizes them as crossing points.
- *
- * @param {Feature<LineString>} line
- * @param {number} extendDist (distance to extend in Turf units)
- */
-function extendLine (line, extendDist = 1, units = 'meters') {
-  const coords = line.geometry.coordinates
-  const result = []
-
-  // Extend start point backward
-  const startBearing = turfBearing(coords[1], coords[0])
-  const newStart = turfDestination(coords[0], extendDist, startBearing, { units })
-  result.push(newStart.geometry.coordinates)
-
-  // Process each vertex
-  for (let i = 0; i < coords.length; i++) {
-    if (i > 0 && i < coords.length - 1) {
-      // Intermediate vertex: add extension past it (creates spike for boundary crossing)
-      const incomingBearing = turfBearing(coords[i - 1], coords[i])
-      const pastPt = turfDestination(coords[i], extendDist, incomingBearing, { units })
-      result.push(pastPt.geometry.coordinates)
-    }
-
-    result.push(coords[i])
-  }
-
-  // Extend end point forward
-  const endBearing = turfBearing(coords[coords.length - 2], coords[coords.length - 1])
-  const newEnd = turfDestination(coords[coords.length - 1], extendDist, endBearing, { units })
-  result.push(newEnd.geometry.coordinates)
-
-  return turfLineString(result)
-}
-
-/**
- * Split a polygon using a line.
- * Only accepts splits that result in exactly two polygons.
- *
- * @param {Feature<Polygon>} polygon
- * @param {Feature<LineString>} line
- * @returns {FeatureCollection<Polygon>|null}
- */
-const splitPolygon = (polygon, line) => {
-  // Extend only start and end vertices
-  const extended = extendLine(line) // assume extendLine only touches start/end now
-
-  let result
-  try {
-    result = polygonSplitter(polygon, extended)
-  } catch {
-    return null
-  }
-
-  // Must result in exactly 2 polygons
-  let polygons = []
-  if (result.geometry.type === 'MultiPolygon') {
-    if (result.geometry.coordinates.length !== 2) {
-      return null
-    }
-    polygons = result.geometry.coordinates.map(coords => turfPolygon(coords, polygon.properties))
-  } else {
-    return null
-  }
-
-  // Assign IDs & properties
-  const baseId = polygon.id ?? polygon.properties?.id ?? 'poly'
-  const features = polygons.map((poly, i) =>
-    turfPolygon(
-      poly.geometry.coordinates,
-      { ...polygon.properties, id: baseId },
-      { id: `${baseId}-${i + 1}` }
-    )
-  )
-
-  return turfFeatureCollection(features)
-}
-
-/**
- * Convert a GeoJSON Feature or geometry-like object into a Turf geometry.
- *
- * @param {Object} featureOrGeom - Either a Feature with a `.geometry` property or a raw GeoJSON geometry object.
- * @returns {Object} Turf geometry (Polygon, LineString, Point, etc.)
- *
- * @throws Will throw if the geometry type is not supported.
- */
-const toTurfGeometry = (featureOrGeom) => {
-  const geom = featureOrGeom.geometry || featureOrGeom
-
-  switch (geom.type) {
-    case 'Polygon':
-      return turfPolygon(geom.coordinates)
-    case 'MultiPolygon':
-      return turfMultiPolygon(geom.coordinates)
-    case 'LineString':
-      return turfLineString(geom.coordinates)
-    case 'MultiLineString':
-      return turfMultiLineString(geom.coordinates)
-    case 'Point':
-      return turfPoint(geom.coordinates)
-    case 'MultiPoint':
-      return turfMultiPoint(geom.coordinates)
-    default:
-      throw new Error(`Unsupported geometry type: ${geom.type}`)
-  }
-}
-
-const haversine = ([lon1, lat1], [lon2, lat2]) => {
-  const toRad = deg => deg * Math.PI / 180
-  const R = 6371000 // meters
-  const dLat = toRad(lat2 - lat1)
-  const dLon = toRad(lon2 - lon1)
-  const a = Math.sin(dLat / 2) ** 2 + Math.cos(toRad(lat1)) * Math.cos(toRad(lat2)) * Math.sin(dLon / 2) ** 2
-  return 2 * R * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
-}
-
-const isNewCoordinate = (coords, tolerance = 0.01) => {
-  // First coord
-  if (coords[0].length <= 1) {
-    return true
-  }
-  // Subsequent coordsmust be different
-  if (coords[0].length <= 3) {
-    for (let i = 0; i < coords[0].length; i++) {
-      for (let j = i + 1; j < coords[0].length; j++) {
-        if (haversine(coords[0][i], coords[0][j]) < tolerance) {
-          return false
-        }
-      }
-    }
-  }
-  return true
-}
-
-const isNewLineCoordinate = (coords, tolerance = 0.01) => {
-  // First coord is always valid
-  if (coords.length <= 1) {
-    return true
-  }
-  // Check last two coords are different
-  if (coords.length >= 2) {
-    const last = coords[coords.length - 1]
-    const secondLast = coords[coords.length - 2]
-    if (haversine(last, secondLast) < tolerance) {
-      return false
-    }
-  }
-  return true
-}
-
-const isValidLineClick = (coords) => {
-  // First coord is always valid
-  if (coords.length <= 1) {
-    return true
-  }
-  // Check that the new coordinate is different from the previous one
-  return isNewLineCoordinate(coords)
-}
-
-const isValidClick = (coords) => {
-  // Less than 4 and new coordinates
-  if (coords[0].length <= 1 || isNewCoordinate(coords)) {
-    return true
-  }
-
-  // Basic checks
-  if (!Array.isArray(coords) || coords.length < 4) {
-    return false
-  }
-
-  // Check if ring is closed
-  const first = coords[0]
-  const last = coords[coords.length - 1]
-  const isClosed = first[0] === last[0] && first[1] === last[1]
-  if (!isClosed) {
-    return false
-  }
-
-  // Create a turf polygon
-  const turfPoly = turfPolygon([coords])
-
-  // Check if geometry is valid (non-self-intersecting)
-  const valid = turfBooleanValid(turfPoly)
-  if (!valid) {
-    return false
-  }
-
-  // Check if area is positive
-  const polyArea = turfArea(turfPoly)
-  if (polyArea <= 0) {
-    return false
-  }
-
-  return true
-}
-
-const spatialNavigate = (start, pixels, direction) => {
-  const quadrant = pixels.filter((p, i) => {
-    const offsetX = Math.abs(p[0] - start[0])
-    const offsetY = Math.abs(p[1] - start[1])
-    let isQuadrant = false
-    if (direction === 'ArrowUp') {
-      isQuadrant = p[1] <= start[1] && offsetY >= offsetX
-    } else if (direction === 'ArrowDown') {
-      isQuadrant = p[1] > start[1] && offsetY >= offsetX
-    } else if (direction === 'ArrowLeft') {
-      isQuadrant = p[0] <= start[0] && offsetY < offsetX
-    } else if (direction === 'ArrowRight') {
-      isQuadrant = p[0] > start[0] && offsetY < offsetX
-    } else {
-      isQuadrant = true
-    }
-    return isQuadrant && (JSON.stringify(p) !== JSON.stringify(start))
-  })
-
-  if (!quadrant.length) {
-    quadrant.push(start)
-  }
-
-  const pythagorean = (a, b) => Math.sqrt(Math.pow(a, 2) + Math.pow(b, 2))
-  const distances = quadrant.map(p => pythagorean(Math.abs(start[0] - p[0]), Math.abs(start[1] - p[1])))
-  const closest = quadrant[distances.indexOf(Math.min(...distances))]
-  return pixels.findIndex(i => JSON.stringify(i) === JSON.stringify(closest))
-}
-
-export {
-  toTurfGeometry,
-  splitPolygon,
-  extendLine,
-  isNewCoordinate,
-  isValidClick,
-  isValidLineClick,
-  spatialNavigate
-}
diff --git a/plugins/beta/draw-ol/src/DrawInit.jsx b/plugins/beta/draw-ol/src/DrawInit.jsx
deleted file mode 100644
index b591c7d83..000000000
--- a/plugins/beta/draw-ol/src/DrawInit.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import { useEffect } from 'react'
-import { EVENTS } from '../../../../src/config/events.js'
-import { createOLDraw } from './olDraw.js'
-import { attachEvents } from './events.js'
-
-export const DrawInit = ({ appState, appConfig, mapState, pluginConfig, pluginState, services, mapProvider, buttonConfig }) => {
-  const { eventBus } = services
-  const { crossHair } = mapState
-  const isTouchOrKeyboard = ['touch', 'keyboard'].includes(appState.interfaceType)
-
-  // Create the OLDrawManager once when the map is ready
-  useEffect(() => {
-    if (!mapState.isMapReady) {
-      return undefined
-    }
-
-    const { remove } = createOLDraw({ mapProvider, events: EVENTS, eventBus, pluginConfig, mapStyle: mapState.mapStyle })
-
-    pluginState.dispatch({ type: 'SET_MODE', payload: null })
-    pluginState.dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: pluginConfig.snapLayers?.length > 0 })
-    eventBus.emit('draw:ready')
-
-    return () => remove()
-  }, [mapState.isMapReady])
-
-  // Show crosshair when entering draw mode on touch/keyboard
-  useEffect(() => {
-    if (!['draw_polygon', 'draw_line'].includes(pluginState.mode) || !isTouchOrKeyboard) {
-      return undefined
-    }
-    const wasVisible = crossHair.isVisible
-    crossHair.fixAtCenter()
-    return () => {
-      if (!wasVisible) { crossHair.hide() }
-    }
-  }, [pluginState.mode, appState.interfaceType])
-
-  // Keep edit mode in sync with the global interface type so the touch
-  // offset target hides immediately when the user switches to mouse/keyboard.
-  useEffect(() => {
-    if (pluginState.mode !== 'edit_vertex' || !mapProvider.draw) {
-      return undefined
-    }
-    mapProvider.draw.setInterfaceType(appState.interfaceType)
-    return undefined
-  }, [appState.interfaceType, pluginState.mode])
-
-  // Re-attach events when state changes
-  useEffect(() => {
-    if (!mapProvider.draw) {
-      return undefined
-    }
-
-    return attachEvents({
-      appState,
-      appConfig,
-      mapState,
-      mapProvider,
-      buttonConfig,
-      pluginState,
-      events: EVENTS,
-      eventBus
-    })
-  }, [mapProvider, appState, pluginState])
-}
diff --git a/plugins/beta/draw-ol/src/api/addFeature.js b/plugins/beta/draw-ol/src/api/addFeature.js
deleted file mode 100644
index fa1c21091..000000000
--- a/plugins/beta/draw-ol/src/api/addFeature.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { flattenStyleProperties } from '../utils/flattenStyleProperties.js'
-
-/**
- * Add a pre-drawn feature (GeoJSON) to the draw layer.
- * The feature will be stored and available for editing.
- *
- * @param {object} context - plugin context
- * @param {object} feature - GeoJSON feature with id, geometry, properties
- */
-export const addFeature = ({ mapProvider, services }, feature) => {
-  const { draw } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return
-  }
-
-  const { stroke, fill, strokeWidth, properties, ...featureRest } = feature
-  const flatFeature = {
-    ...featureRest,
-    properties: {
-      ...properties,
-      ...flattenStyleProperties({ stroke, fill, strokeWidth })
-    }
-  }
-
-  draw.add(flatFeature)
-  eventBus.emit('draw:add', flatFeature)
-}
diff --git a/plugins/beta/draw-ol/src/api/deleteFeature.js b/plugins/beta/draw-ol/src/api/deleteFeature.js
deleted file mode 100644
index 1ed647f94..000000000
--- a/plugins/beta/draw-ol/src/api/deleteFeature.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Delete a feature from the draw layer by ID.
- *
- * @param {object} context - plugin context
- * @param {string} featureId - ID of the feature to delete
- */
-export const deleteFeature = ({ mapProvider }, featureId) => {
-  const { draw } = mapProvider
-  if (!draw) return
-  draw.delete(featureId)
-}
diff --git a/plugins/beta/draw-ol/src/api/editFeature.js b/plugins/beta/draw-ol/src/api/editFeature.js
deleted file mode 100644
index 10bd6a240..000000000
--- a/plugins/beta/draw-ol/src/api/editFeature.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Programmatically start editing a feature.
- *
- * @param {object} context - plugin context
- * @param {string} featureId - ID of the feature to edit
- * @param {object} options - { snapLayers }
- * @returns {boolean} true if edit mode entered, false if feature not found
- */
-export const editFeature = (
-  { appState, appConfig, pluginConfig, pluginState, mapProvider, services },
-  featureId,
-  options = {}
-) => {
-  const { dispatch } = pluginState
-  const { draw } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return false
-  }
-
-  const existingFeature = draw.get(featureId)
-  if (!existingFeature) {
-    return false
-  }
-
-  eventBus.emit('draw:editstart', { mode: 'edit_vertex' })
-
-  const snapLayers = options.snapLayers === undefined
-    ? (pluginConfig.snapLayers ?? null)
-    : options.snapLayers
-
-  draw.snap?.setSnapLayers(snapLayers)
-  dispatch({ type: 'SET_HAS_SNAP_LAYERS', payload: snapLayers?.length > 0 })
-
-  draw.changeMode('edit_vertex', {
-    container: appState.layoutRefs.viewportRef.current,
-    deleteVertexButtonId: `${appConfig.id}-draw-delete-point`,
-    interfaceType: appState.interfaceType,
-    featureId
-  })
-
-  dispatch({
-    type: 'SET_FEATURE',
-    payload: { feature: existingFeature, tempFeature: existingFeature }
-  })
-
-  dispatch({ type: 'SET_MODE', payload: 'edit_vertex' })
-  return true
-}
diff --git a/plugins/beta/draw-ol/src/api/newLine.js b/plugins/beta/draw-ol/src/api/newLine.js
deleted file mode 100644
index c07b863b9..000000000
--- a/plugins/beta/draw-ol/src/api/newLine.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { flattenStyleProperties } from '../utils/flattenStyleProperties.js'
-
-/**
- * Programmatically start drawing a new line.
- *
- * @param {object} context - plugin context
- * @param {string} featureId - unique ID for this feature
- * @param {object} options - { snapLayers, stroke, fill, strokeWidth, properties }
- */
-export const newLine = (
-  { appState, appConfig, mapState, pluginState, mapProvider, services },
-  featureId,
-  options = {}
-) => {
-  const { dispatch } = pluginState
-  const { draw } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return
-  }
-
-  eventBus.emit('draw:started', { mode: 'draw_line' })
-
-  const { stroke, fill, strokeWidth, properties: customProperties, ...modeOptions } = options
-  const properties = {
-    ...customProperties,
-    ...flattenStyleProperties({ stroke, fill, strokeWidth })
-  }
-
-  draw.changeMode('draw_line', {
-    container: appState.layoutRefs.viewportRef.current,
-    interfaceType: appState.interfaceType,
-    addVertexButtonId: `${appConfig.id}-draw-add-point`,
-    featureId,
-    geometryType: 'LineString',
-    properties,
-    mapProvider,
-    crossHair: mapState.crossHair,
-    ...modeOptions
-  })
-
-  dispatch({ type: 'SET_MODE', payload: 'draw_line' })
-}
diff --git a/plugins/beta/draw-ol/src/api/newPolygon.js b/plugins/beta/draw-ol/src/api/newPolygon.js
deleted file mode 100644
index 0e3becf3d..000000000
--- a/plugins/beta/draw-ol/src/api/newPolygon.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import { flattenStyleProperties } from '../utils/flattenStyleProperties.js'
-
-/**
- * Programmatically start drawing a new polygon.
- *
- * @param {object} context - plugin context
- * @param {string} featureId - unique ID for this feature
- * @param {object} options - { snapLayers, stroke, fill, strokeWidth, properties }
- */
-export const newPolygon = (
-  { appState, appConfig, mapState, pluginState, mapProvider, services },
-  featureId,
-  options = {}
-) => {
-  const { dispatch } = pluginState
-  const { draw } = mapProvider
-  const { eventBus } = services
-
-  if (!draw) {
-    return
-  }
-
-  eventBus.emit('draw:started', { mode: 'draw_polygon' })
-
-  const { stroke, fill, strokeWidth, properties: customProperties, ...modeOptions } = options
-  const properties = {
-    ...customProperties,
-    ...flattenStyleProperties({ stroke, fill, strokeWidth })
-  }
-
-  draw.changeMode('draw_polygon', {
-    container: appState.layoutRefs.viewportRef.current,
-    interfaceType: appState.interfaceType,
-    addVertexButtonId: `${appConfig.id}-draw-add-point`,
-    featureId,
-    geometryType: 'Polygon',
-    properties,
-    mapProvider,
-    crossHair: mapState.crossHair,
-    ...modeOptions
-  })
-
-  dispatch({ type: 'SET_MODE', payload: 'draw_polygon' })
-}
diff --git a/plugins/beta/draw-ol/src/core/OLDrawManager.js b/plugins/beta/draw-ol/src/core/OLDrawManager.js
deleted file mode 100644
index e7d8b8356..000000000
--- a/plugins/beta/draw-ol/src/core/OLDrawManager.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import VectorLayer from 'ol/layer/Vector.js'
-import { createFeatureStore } from './featureStore.js'
-import { createUndoStack } from './undoStack.js'
-import { createStyles } from './styles.js'
-import { resolveColors } from '../utils/resolveColors.js'
-import { createSnapManager } from '../snap/snapManager.js'
-import { DEFAULTS } from '../defaults.js'
-
-/**
- * Mode machine for the OL draw plugin.
- *
- * Owns the VectorSource/Layer, undo stack, and current mode instance.
- * Exposes a minimal on/off/emit event bus for internal plugin communication
- * (separate from the public eventBus used for consumer-facing events).
- *
- * Consumer-facing events are always emitted via eventBus by events.js after
- * listening to the manager's internal events.
- */
-export class OLDrawManager {
-  constructor (map, pluginConfig = {}) {
-    this._map = map
-    this._pluginConfig = pluginConfig
-    this._mode = 'disabled'
-    this._modeInstance = null
-    this._listeners = new Map()
-
-    this.store = createFeatureStore()
-    this.undoStack = createUndoStack((length) => this.emit('undochange', length))
-
-    this.colors = resolveColors(null, pluginConfig)
-    this.styles = createStyles(this.colors)
-    this.snap = createSnapManager(map, pluginConfig.snapLayers ?? null, this.colors, pluginConfig.snapRadius ?? DEFAULTS.snapRadius)
-
-    this._layer = new VectorLayer({
-      source: this.store.source,
-      style: this.styles.createFeatureStyle(),
-      zIndex: 100
-    })
-    this._layer.set('layerId', 'draw')
-    map.addLayer(this._layer)
-  }
-
-  // --- Color / style updates ---
-
-  setMapStyle (mapStyle) {
-    this.colors = resolveColors(mapStyle, this._pluginConfig)
-    this.styles = createStyles(this.colors)
-    this._layer.setStyle(this.styles.createFeatureStyle())
-    this.store.source.changed()
-    this.snap?.updateColors(this.colors)
-    this.emit('styleschanged', this.styles)
-  }
-
-  // --- Internal event bus ---
-
-  on (type, handler) {
-    if (!this._listeners.has(type)) {
-      this._listeners.set(type, new Set())
-    }
-    this._listeners.get(type).add(handler)
-  }
-
-  off (type, handler) {
-    this._listeners.get(type)?.delete(handler)
-  }
-
-  emit (type, detail) {
-    this._listeners.get(type)?.forEach(h => h(detail))
-  }
-
-  // --- Mode machine ---
-
-  async changeMode (modeName, options = {}) {
-    this._modeInstance?.destroy()
-    this._modeInstance = null
-    this._mode = modeName
-
-    const isDrawMode = modeName === 'draw_polygon' || modeName === 'draw_line' || modeName === 'edit_vertex'
-    this.snap?.setIndicatorActive(isDrawMode)
-
-    const modeOptions = { ...options, snap: this.snap }
-
-    if (modeName === 'draw_polygon' || modeName === 'draw_line') {
-      const { createDrawMode } = await import('../draw/DrawMode.js')
-      this._modeInstance = createDrawMode({ map: this._map, manager: this, options: modeOptions })
-    } else if (modeName === 'edit_vertex') {
-      const { createEditMode } = await import('../edit/EditMode.js')
-      this._modeInstance = createEditMode({ map: this._map, manager: this, options: modeOptions })
-    } else {
-      // disabled — no mode instance needed
-    }
-    // Reattach snap interaction after mode's interactions are added so it
-    // processes pointermove first (OL: last-added interaction = first to handle events).
-    this.snap?.reattach()
-  }
-
-  getMode () {
-    return this._mode
-  }
-
-  // --- High-level operations called by events.js ---
-
-  done () {
-    this._modeInstance?.done()
-  }
-
-  cancel () {
-    this._modeInstance?.cancel()
-    this.changeMode('disabled')
-  }
-
-  undo () {
-    this._modeInstance?.undo()
-  }
-
-  deleteVertex () {
-    this._modeInstance?.deleteVertex()
-  }
-
-  setInterfaceType (type) {
-    this._modeInstance?.setInterfaceType?.(type)
-  }
-
-  // --- Feature store delegation ---
-
-  get (id) {
-    return this.store.get(id)
-  }
-
-  add (geojsonFeature) {
-    return this.store.add(geojsonFeature)
-  }
-
-  delete (id) {
-    return this.store.remove(id)
-  }
-
-  deleteAll () {
-    return this.store.clear()
-  }
-
-  // --- Cleanup ---
-
-  remove () {
-    this._modeInstance?.destroy()
-    this._modeInstance = null
-    this.snap?.destroy()
-    this.snap = null
-    this.store.clear()
-    this._map.removeLayer(this._layer)
-    this._listeners.clear()
-  }
-}
diff --git a/plugins/beta/draw-ol/src/core/featureStore.js b/plugins/beta/draw-ol/src/core/featureStore.js
deleted file mode 100644
index 5d3aa6e72..000000000
--- a/plugins/beta/draw-ol/src/core/featureStore.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import VectorSource from 'ol/source/Vector.js'
-import GeoJSON from 'ol/format/GeoJSON.js'
-
-const PROJECTION = 'EPSG:27700'
-
-// No coordinate transformation: data and map both use BNG.
-const format = new GeoJSON({ dataProjection: PROJECTION, featureProjection: PROJECTION })
-
-/**
- * Wraps an OL VectorSource with a GeoJSON-oriented API keyed by feature ID.
- * All GeoJSON in and out uses EPSG:27700 coordinates (BNG easting/northing).
- */
-export const createFeatureStore = () => {
-  const source = new VectorSource()
-
-  return {
-    /** The underlying VectorSource, passed to OL interactions and layers. */
-    source,
-
-    /** Get the raw OL Feature by ID, or null. */
-    getOL (id) {
-      return source.getFeatureById(String(id)) ?? null
-    },
-
-    /** Add or replace a GeoJSON feature. Returns the OL Feature. */
-    add (geojsonFeature) {
-      const existing = this.getOL(geojsonFeature.id)
-      if (existing) {
-        source.removeFeature(existing)
-      }
-      const olFeature = format.readFeature(geojsonFeature)
-      source.addFeature(olFeature)
-      return olFeature
-    },
-
-    /** Get a GeoJSON feature by ID, or null. */
-    get (id) {
-      const feature = this.getOL(id)
-      return feature ? format.writeFeatureObject(feature) : null
-    },
-
-    /** Remove a feature by ID. */
-    remove (id) {
-      const feature = this.getOL(id)
-      if (feature) {
-        source.removeFeature(feature)
-      }
-    },
-
-    /** Remove all features. */
-    clear () {
-      source.clear()
-    },
-
-    /** Convert an OL Feature to a GeoJSON object. */
-    toGeoJSON (olFeature) {
-      return format.writeFeatureObject(olFeature)
-    },
-
-    /** Convert a GeoJSON object to an OL Feature (no side effects). */
-    fromGeoJSON (geojsonFeature) {
-      return format.readFeature(geojsonFeature)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/core/styles.js b/plugins/beta/draw-ol/src/core/styles.js
deleted file mode 100644
index d00b246b0..000000000
--- a/plugins/beta/draw-ol/src/core/styles.js
+++ /dev/null
@@ -1,98 +0,0 @@
-import Style from 'ol/style/Style.js'
-import Fill from 'ol/style/Fill.js'
-import Stroke from 'ol/style/Stroke.js'
-import CircleStyle from 'ol/style/Circle.js'
-
-const selectedVertexRadii = { outer: 11, mid: 8, inner: 6 }
-const selectedMidpointRadii = { outer: 9, mid: 6, inner: 4 }
-
-const fillArc = (ctx, cx, cy, radius, fillStyle) => {
-  ctx.beginPath()
-  ctx.arc(cx, cy, radius, 0, Math.PI * 2)
-  ctx.fillStyle = fillStyle
-  ctx.fill()
-}
-
-// Custom renderer draws all arcs at the same (cx,cy) so concentric rings never
-// drift at fractional CSS scales (e.g. 1.5×) the way separate drawImage calls can.
-const makeRingRenderer = ({ outer, mid, inner }, colors, innerKey) => (pixelCoordinates, state) => {
-  const ctx = state.context
-  const pr = state.pixelRatio
-  const [cx, cy] = /** @type {number[]} */ (pixelCoordinates)
-  ctx.save()
-  fillArc(ctx, cx, cy, outer * pr, colors.editActive)
-  fillArc(ctx, cx, cy, mid * pr, colors.editHalo)
-  fillArc(ctx, cx, cy, inner * pr, colors[innerKey])
-  ctx.restore()
-}
-
-const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1)
-
-/**
- * Create all draw-ol style instances for the given resolved color set.
- *
- * @param {object} colors - Output of resolveColors()
- * @returns {{ vertexStyle, selectedVertexStyle, midpointStyle, selectedMidpointStyle,
- *             editFeatureStyle, createSketchStyle, createFeatureStyle }}
- */
-export const createStyles = (colors) => {
-  const vertexStyle = new Style({
-    image: new CircleStyle({
-      radius: 6,
-      fill: new Fill({ color: colors.editVertex })
-    })
-  })
-
-  const selectedVertexStyle = new Style({ renderer: makeRingRenderer(selectedVertexRadii, colors, 'editVertex') })
-
-  const midpointStyle = new Style({
-    image: new CircleStyle({
-      radius: 4,
-      fill: new Fill({ color: colors.editMidpoint })
-    })
-  })
-
-  const selectedMidpointStyle = new Style({ renderer: makeRingRenderer(selectedMidpointRadii, colors, 'editMidpoint') })
-
-  const editFeatureStyle = new Style({
-    stroke: new Stroke({ color: colors.editStroke, width: 2 }),
-    fill: new Fill({ color: colors.shapeFill })
-  })
-
-  const sketchLineStyle = new Style({
-    stroke: new Stroke({ color: colors.editStroke, width: 2 }),
-    fill: new Fill({ color: colors.shapeFill })
-  })
-
-  const sketchPointStyle = new Style({
-    image: new CircleStyle({
-      radius: 5,
-      fill: new Fill({ color: colors.editVertex })
-    })
-  })
-
-  const createSketchStyle = () => (feature) =>
-    feature.getGeometry().getType() === 'Point' ? [sketchPointStyle] : [sketchLineStyle]
-
-  const createFeatureStyle = () => (feature) => {
-    const p = feature.getProperties()
-    const id = colors.mapStyleId
-    const stroke = (id && p[`stroke${capitalize(id)}`]) || p.stroke || colors.shapeStroke
-    const fill = (id && p[`fill${capitalize(id)}`]) || p.fill || colors.shapeFill
-    const strokeWidth = p.strokeWidth || colors.strokeWidth
-    return [new Style({
-      stroke: new Stroke({ color: stroke, width: strokeWidth }),
-      fill: new Fill({ color: fill })
-    })]
-  }
-
-  return {
-    vertexStyle,
-    selectedVertexStyle,
-    midpointStyle,
-    selectedMidpointStyle,
-    editFeatureStyle,
-    createSketchStyle,
-    createFeatureStyle
-  }
-}
diff --git a/plugins/beta/draw-ol/src/core/undoStack.js b/plugins/beta/draw-ol/src/core/undoStack.js
deleted file mode 100644
index bd27e4659..000000000
--- a/plugins/beta/draw-ol/src/core/undoStack.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Undo stack for draw operations.
- * Calls onChange(length) whenever the stack changes so the UI can update.
- *
- * @param {(length: number) => void} onChange
- */
-export const createUndoStack = (onChange) => {
-  const stack = []
-
-  return {
-    push (operation) {
-      stack.push(operation)
-      onChange(stack.length)
-    },
-
-    pop () {
-      const op = stack.pop()
-      onChange(stack.length)
-      return op
-    },
-
-    clear () {
-      stack.length = 0
-      onChange(stack.length)
-    },
-
-    get length () {
-      return stack.length
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/defaults.js b/plugins/beta/draw-ol/src/defaults.js
deleted file mode 100644
index 002e5f7ea..000000000
--- a/plugins/beta/draw-ol/src/defaults.js
+++ /dev/null
@@ -1,16 +0,0 @@
-export const DEFAULTS = {
-  editStroke: { light: '#1a65a6', dark: '#ffffff' },
-  editVertex: { light: '#1a65a6', dark: '#ffffff' },
-  editMidpoint: { light: '#1a65a6', dark: '#ffffff' },
-  editHalo: { light: '#ffffff', dark: 'rgba(11,12,12,1)' },
-  editActive: { light: '#000000', dark: '#ffffff' },
-  splitInvalid: { light: 'rgba(29,112,184,1)', dark: 'rgba(29,112,184,1)' },
-  splitValid: { light: 'rgba(29,112,184,1)', dark: 'rgba(29,112,184,1)' },
-  shapeStroke: '#1a65a6',
-  shapeFill: 'rgba(26,101,166,0.1)',
-  strokeWidth: 2,
-  snapVertex: 'rgba(212,53,28,0.5)',
-  snapMidpoint: 'rgba(40,161,151,1)',
-  snapEdge: 'rgba(29,112,184,0.5)',
-  snapRadius: 10
-}
diff --git a/plugins/beta/draw-ol/src/draw.scss b/plugins/beta/draw-ol/src/draw.scss
deleted file mode 100644
index eed868a03..000000000
--- a/plugins/beta/draw-ol/src/draw.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-// Draw plugin styles for OpenLayers
-
-.im-draw-touch-target {
-  color: #3b82f6;
-  filter: drop-shadow(0 2px 4px rgba(0, 0, 0, 0.15));
-  cursor: grab;
-
-  &:active {
-    cursor: grabbing;
-  }
-}
-
-// Accessibility: focus visible on buttons
-.im-draw-button:focus-visible {
-  outline: 2px solid #3b82f6;
-  outline-offset: 2px;
-}
diff --git a/plugins/beta/draw-ol/src/draw/DrawMode.js b/plugins/beta/draw-ol/src/draw/DrawMode.js
deleted file mode 100644
index fc12e4542..000000000
--- a/plugins/beta/draw-ol/src/draw/DrawMode.js
+++ /dev/null
@@ -1,121 +0,0 @@
-import Draw from 'ol/interaction/Draw.js'
-import { noModifierKeys } from 'ol/events/condition.js'
-import { createDrawInput } from './drawInput.js'
-import { getCoords } from '../utils/geometryHelpers.js'
-
-const SNAP_TOLERANCE_PX = 12
-const MIN_VERTICES = { Polygon: 3, LineString: 2 }
-
-const canFinish = (geometryType, sketchFeature) => {
-  if (!sketchFeature) { return false }
-  const geom = sketchFeature.getGeometry()
-  const coords = getCoords({ type: geometryType, coordinates: geom.getCoordinates() })
-  // OL keeps a trailing rubber-band coordinate; subtract 1 to get real vertex count
-  return coords.length - 1 >= MIN_VERTICES[geometryType]
-}
-
-// OL closes Polygon rings by appending v1: [...placed, rubber_band, v1_closing]; last placed is 3 from end.
-const POLY_LAST_PLACED_OFFSET = 3
-
-const getLastPlacedCoord = (geom) => {
-  if (geom.getType() === 'Polygon') {
-    const ring = geom.getCoordinates()[0] || []
-    return ring.length >= POLY_LAST_PLACED_OFFSET ? ring[ring.length - POLY_LAST_PLACED_OFFSET] : null
-  }
-  const coords = geom.getCoordinates()
-  return coords.length >= 2 ? coords[coords.length - 2] : null
-}
-
-const DUPLICATE_TOLERANCE_PX = 2
-
-const buildCondition = (map, geometryType, getSketchFeature) => (e) => {
-  if (!noModifierKeys(e)) { return false }
-  const sf = getSketchFeature()
-  if (!sf || canFinish(geometryType, sf)) { return true }
-  const prev = getLastPlacedCoord(sf.getGeometry())
-  if (!prev) { return true }
-  const pp = map.getPixelFromCoordinate(prev)
-  if (!pp) { return true }
-  const dx = e.pixel[0] - pp[0]; const dy = e.pixel[1] - pp[1]
-  return dx * dx + dy * dy > DUPLICATE_TOLERANCE_PX * DUPLICATE_TOLERANCE_PX
-}
-
-export const createDrawMode = ({ map, manager, options }) => {
-  const {
-    geometryType,
-    featureId,
-    properties = {},
-    container,
-    interfaceType,
-    addVertexButtonId,
-    mapProvider,
-    snap
-  } = options
-
-  let sketchFeature = null
-
-  const drawInteraction = new Draw({
-    type: geometryType,
-    style: manager.styles.createSketchStyle(),
-    stopClick: true,
-    snapTolerance: SNAP_TOLERANCE_PX,
-    condition: buildCondition(map, geometryType, () => sketchFeature)
-  })
-  map.addInteraction(drawInteraction)
-  // OL internal: overlay_ is the private VectorLayer used for the sketch geometry.
-  // updateWhileAnimating_ forces per-frame redraws during view animations (keyboard pan).
-  // Without this, geom.setCoordinates() calls are ignored while the ANIMATING hint is set.
-  // Check ol/interaction/Draw.js and ol/layer/BaseVector.js if this breaks after an OL upgrade.
-  drawInteraction.overlay_.updateWhileAnimating_ = true
-
-  const updateVertexCount = () => {
-    if (!sketchFeature) { return }
-    const geom = sketchFeature.getGeometry()
-    const coords = getCoords({ type: geometryType, coordinates: geom.getCoordinates() })
-    // OL always keeps a trailing rubber-band coordinate; subtract 1
-    manager.emit('vertexchange', { numVertices: Math.max(0, coords.length - 1) })
-  }
-
-  drawInteraction.on('drawstart', (e) => {
-    sketchFeature = e.feature
-    sketchFeature.getGeometry().on('change', updateVertexCount)
-  })
-
-  drawInteraction.on('drawend', (e) => {
-    const olFeature = e.feature
-    olFeature.setId(String(featureId))
-    olFeature.setProperties(properties)
-    manager.store.source.addFeature(olFeature)
-    manager.emit('create', manager.store.toGeoJSON(olFeature))
-    // Mode switches to disabled in events.js after receiving 'create'
-  })
-
-  drawInteraction.on('drawabort', () => { manager.emit('cancel') })
-
-  const input = createDrawInput({
-    drawInteraction,
-    manager,
-    options: {
-      container,
-      interfaceType,
-      addVertexButtonId,
-      mapProvider,
-      snap,
-      onUndo: () => { drawInteraction.removeLastPoint(); updateVertexCount() },
-      canFinish: () => canFinish(geometryType, sketchFeature)
-    }
-  })
-
-  return {
-    done () {
-      if (canFinish(geometryType, sketchFeature)) { drawInteraction.finishDrawing() }
-    },
-    cancel () { drawInteraction.abortDrawing() },
-    undo () { drawInteraction.removeLastPoint(); updateVertexCount() },
-    destroy () {
-      input.destroy()
-      map.removeInteraction(drawInteraction)
-      sketchFeature = null
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/draw/drawInput.js b/plugins/beta/draw-ol/src/draw/drawInput.js
deleted file mode 100644
index 212a67e55..000000000
--- a/plugins/beta/draw-ol/src/draw/drawInput.js
+++ /dev/null
@@ -1,243 +0,0 @@
-import { coordToPixel, pixelDist } from '../utils/olCoords.js'
-
-const SNAP_TOLERANCE = 12 // pixels
-// Minimum ring length to allow snap-to-close (placed vertices + rubber-band)
-const MIN_SKETCH_COORDS = { Polygon: 4, LineString: 3 }
-const DUPLICATE_TOLERANCE_PX = 2
-// OL Polygon ring layout after addToDrawing_: [...committed, rubber_band, closing_v1]
-const POLY_COMMITTED_OFFSET = 3
-const ARROW_KEYS = new Set(['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'])
-
-const isCloseToFirstVertex = (map, coord, sketchCoords, geometryType) => {
-  if (geometryType !== 'Polygon' || sketchCoords.length < MIN_SKETCH_COORDS.Polygon) {
-    return false
-  }
-  const firstCoord = sketchCoords[0]
-  const currentPixel = coordToPixel(map, coord)
-  const firstPixel = coordToPixel(map, firstCoord)
-  if (!currentPixel || !firstPixel) {
-    return false
-  }
-  return pixelDist(currentPixel, firstPixel) < SNAP_TOLERANCE
-}
-
-const applyRubberbanding = (geom, centerCoord) => {
-  if (geom.getType() === 'LineString') {
-    const updated = [...geom.getCoordinates()]
-    updated[updated.length - 1] = centerCoord
-    geom.setCoordinates(updated)
-  } else if (geom.getType() === 'Polygon') {
-    const updated = geom.getCoordinates().map((ring, i) => {
-      if (i !== 0) {
-        return ring
-      }
-      const r = [...ring]
-      r[r.length - 1] = centerCoord
-      return r
-    })
-    geom.setCoordinates(updated)
-  } else {
-    // No action
-  }
-}
-
-// Returns the last vertex committed by OL's Draw interaction (not the rubber-band or
-// the closing copy that OL appends to Polygon rings).
-const getLastCommittedVertex = (geom) => {
-  if (geom.getType() === 'Polygon') {
-    const ring = geom.getCoordinates()[0] || []
-    return ring.length >= POLY_COMMITTED_OFFSET ? ring[ring.length - POLY_COMMITTED_OFFSET] : null
-  }
-  const coords = geom.getCoordinates()
-  return coords.length >= 2 ? coords[coords.length - 2] : null
-}
-
-const wireInputEvents = ({
-  container, addVertexButtonId, olView, onUndo,
-  getInterfaceType, setInterfaceType, clearLastCoord,
-  updateRubberbanding, placeVertex
-}) => {
-  const onCenterChange = () => {
-    if (getInterfaceType() !== 'mouse') {
-      updateRubberbanding()
-    }
-  }
-  olView?.on('change:center', onCenterChange)
-
-  const onKeydown = (e) => {
-    if (!container.contains(document.activeElement)) {
-      return
-    }
-    if (ARROW_KEYS.has(e.key)) {
-      setInterfaceType('keyboard')
-      return
-    }
-    if (e.key === 'Enter') {
-      e.preventDefault()
-      setInterfaceType('keyboard')
-      placeVertex()
-    }
-    if (e.key === 'z' && (e.metaKey || e.ctrlKey)) {
-      e.preventDefault()
-      onUndo?.()
-    }
-  }
-
-  const onButtonClick = (e) => {
-    if (addVertexButtonId && e.target.closest(`#${addVertexButtonId}`)) {
-      placeVertex()
-    }
-  }
-
-  const onPointerdown = (e) => {
-    if (e.pointerType !== 'touch') {
-      setInterfaceType('mouse')
-      clearLastCoord()
-    }
-  }
-
-  const onTouchstart = () => {
-    setInterfaceType('touch')
-  }
-
-  const onPointerMove = () => {
-    if (getInterfaceType() === 'mouse') {
-      return
-    }
-    updateRubberbanding()
-  }
-
-  globalThis.addEventListener('keydown', onKeydown)
-  globalThis.addEventListener('click', onButtonClick)
-  container.addEventListener('pointerdown', onPointerdown)
-  container.addEventListener('touchstart', onTouchstart, { passive: true })
-  container.addEventListener('pointermove', onPointerMove)
-
-  return {
-    destroy () {
-      olView?.un('change:center', onCenterChange)
-      globalThis.removeEventListener('keydown', onKeydown)
-      globalThis.removeEventListener('click', onButtonClick)
-      container.removeEventListener('pointerdown', onPointerdown)
-      container.removeEventListener('touchstart', onTouchstart)
-      container.removeEventListener('pointermove', onPointerMove)
-    }
-  }
-}
-
-export const createDrawInput = ({ drawInteraction, options }) => {
-  const { container, addVertexButtonId, mapProvider, snap, onUndo, canFinish } = options
-  let interfaceType = options.interfaceType ?? 'mouse'
-  let sketchFeature = null
-  let lastPlacedCoord = null
-
-  drawInteraction.on('drawstart', (e) => {
-    sketchFeature = e.feature
-    lastPlacedCoord = null
-  })
-  drawInteraction.on('drawend', () => {
-    sketchFeature = null
-    lastPlacedCoord = null
-  })
-  drawInteraction.on('drawabort', () => {
-    sketchFeature = null
-    lastPlacedCoord = null
-  })
-
-  const updateRubberbanding = () => {
-    if (!sketchFeature) {
-      // No sketch yet — update snap indicator at crosshair position so targets are
-      // visible before the first vertex is placed (touch/keyboard only; mouse uses
-      // the OL snap interaction's pointermove handler instead).
-      if (interfaceType !== 'mouse' && snap) {
-        snap.apply(mapProvider.getCenter())
-      }
-      return
-    }
-    const geom = sketchFeature.getGeometry()
-    const coords = geom.getCoordinates()
-    if (!coords.length) {
-      return
-    }
-    const raw = mapProvider.getCenter()
-    const centerCoord = (interfaceType !== 'mouse' && snap) ? snap.apply(raw) : raw
-    applyRubberbanding(geom, centerCoord)
-  }
-
-  // Returns true if the vertex was handled as a close/finish attempt (caller should not append).
-  const tryClose = (geom, sketchCoords, coord) => {
-    if (lastPlacedCoord && lastPlacedCoord[0] === coord[0] && lastPlacedCoord[1] === coord[1]) {
-      // Same position as last placed: don't duplicate. Close only if enough real vertices exist.
-      if (canFinish?.()) { drawInteraction.finishDrawing() }
-      lastPlacedCoord = null
-      return true
-    }
-    if (isCloseToFirstVertex(drawInteraction.getMap(), coord, sketchCoords, geom.getType())) {
-      drawInteraction.finishDrawing()
-      return true
-    }
-    // When the add-vertex button overlays the map (touch UI), OL's native pointer handler
-    // and this button click handler both fire for the same tap. Detect that OL already
-    // committed a vertex at coord's position and skip the duplicate appendCoordinates,
-    // but register coord as lastPlacedCoord so a second tap at the same position can close.
-    const map = drawInteraction.getMap()
-    const lastCommitted = getLastCommittedVertex(geom)
-    if (lastCommitted) {
-      const p1 = map.getPixelFromCoordinate(lastCommitted)
-      const p2 = map.getPixelFromCoordinate(coord)
-      if (p1 && p2) {
-        const dx = p1[0] - p2[0]; const dy = p1[1] - p2[1]
-        if (dx * dx + dy * dy < DUPLICATE_TOLERANCE_PX * DUPLICATE_TOLERANCE_PX) {
-          lastPlacedCoord = coord
-          return true
-        }
-      }
-    }
-    return false
-  }
-
-  const placeVertex = () => {
-    const raw = mapProvider.getCenter()
-    const coord = (interfaceType !== 'mouse' && snap) ? snap.apply(raw) : raw
-    snap?.hideIndicator()
-    if (sketchFeature) {
-      const geom = sketchFeature.getGeometry()
-      const rawCoords = geom.getCoordinates()
-      const sketchCoords = geom.getType() === 'Polygon' ? (rawCoords[0] || []) : rawCoords
-      if (tryClose(geom, sketchCoords, coord)) { return }
-    }
-    drawInteraction.appendCoordinates([coord])
-    lastPlacedCoord = coord
-  }
-
-  const map = drawInteraction.getMap()
-  const olView = map?.getView()
-
-  const events = wireInputEvents({
-    container,
-    addVertexButtonId,
-    olView,
-    onUndo,
-    getInterfaceType: () => interfaceType,
-    setInterfaceType: (t) => { interfaceType = t },
-    clearLastCoord: () => { lastPlacedCoord = null },
-    updateRubberbanding,
-    placeVertex
-  })
-
-  // change:center fires once when a keyboard pan animation starts; postrender tracks each frame.
-  const onMapRender = () => {
-    if (interfaceType !== 'mouse' && olView?.getAnimating()) {
-      updateRubberbanding()
-    }
-  }
-  map?.on('postrender', onMapRender)
-
-  return {
-    getInterfaceType: () => interfaceType,
-    destroy () {
-      events.destroy()
-      map?.un('postrender', onMapRender)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/edit/EditMode.js b/plugins/beta/draw-ol/src/edit/EditMode.js
deleted file mode 100644
index f756770d9..000000000
--- a/plugins/beta/draw-ol/src/edit/EditMode.js
+++ /dev/null
@@ -1,424 +0,0 @@
-import Modify from 'ol/interaction/Modify.js'
-import Collection from 'ol/Collection.js'
-import VectorSource from 'ol/source/Vector.js'
-import VectorLayer from 'ol/layer/Vector.js'
-import Feature from 'ol/Feature.js'
-import Point from 'ol/geom/Point.js'
-import { createMidpointLayer } from './midpointLayer.js'
-import { createVertexLayer } from './vertexLayer.js'
-import { createTouchHandler } from './touchHandler.js'
-import { createKeyboardHandler } from './keyboardHandler.js'
-import { findNearest } from './vertexHitTest.js'
-import { deleteVertex, insertAtMidpoint } from './vertexOps.js'
-import { applyUndo } from './undoOps.js'
-import { getCoords, getMidpoints } from '../utils/geometryHelpers.js'
-
-/**
- * Edit vertex mode — handles edit_vertex.
- *
- * OL Modify handles pointer/mouse vertex dragging natively.
- * touchHandler covers touch drag via the SVG offset target.
- * keyboardHandler covers keyboard navigation and nudging.
- *
- * @returns {{ done, cancel, undo, deleteVertex: fn, destroy }}
- */
-export const createEditMode = ({ map, manager, options }) => {
-  const { featureId, container, interfaceType, deleteVertexButtonId, snap } = options
-  const { store, undoStack } = manager
-
-  const olFeature = store.getOL(featureId)
-  if (!olFeature) {
-    return null
-  }
-
-  const originalFeatureStyle = olFeature.getStyle()
-  olFeature.setStyle(manager.styles.editFeatureStyle)
-
-  // Mutable state shared across sub-handlers
-  const state = {
-    olFeature,
-    selectedVertexIndex: -1,
-    selectedVertexType: null,
-    vertices: [],
-    midpoints: [],
-    interfaceType: interfaceType ?? 'mouse'
-  }
-
-  const getState = () => state
-  let onDeselect = null // set after touchHandler is created; hides offset target on any deselect
-  let onUpdate = null // set after touchHandler is created; repositions offset target when vertex coords change
-
-  const setState = (updates) => {
-    Object.assign(state, updates)
-    if (updates.selectedVertexIndex !== undefined) {
-      vertexLayer.setSelected(state.selectedVertexType === 'vertex' ? state.selectedVertexIndex : -1)
-      midpointLayer.setSelected(
-        state.selectedVertexType === 'midpoint' ? state.selectedVertexIndex - state.vertices.length : -1
-      )
-      if (state.selectedVertexIndex < 0) {
-        onDeselect?.()
-      }
-      updateActiveLayer()
-      manager.emit('vertexselection', {
-        index: state.selectedVertexType === 'vertex' ? state.selectedVertexIndex : -1,
-        numVertices: state.vertices.length
-      })
-    }
-    if (updates.vertices !== undefined) {
-      const plainGeom = {
-        type: olFeature.getGeometry().getType(),
-        coordinates: olFeature.getGeometry().getCoordinates()
-      }
-      midpointLayer.update(plainGeom)
-      vertexLayer.update(plainGeom)
-      state.midpoints = midpointLayer.getCoords()
-      updateActiveLayer()
-      onUpdate?.()
-      map.render()
-    }
-  }
-
-  // Lightweight per-frame update during drag — updates layers without emitting events
-  const updateLayersFromGeom = () => {
-    const geom = olFeature.getGeometry()
-    const plainGeom = { type: geom.getType(), coordinates: geom.getCoordinates() }
-    state.vertices = getCoords(plainGeom)
-    state.midpoints = getMidpoints(plainGeom)
-    midpointLayer.update(plainGeom)
-    vertexLayer.update(plainGeom)
-    updateActiveLayer()
-  }
-
-  const syncGeom = () => {
-    updateLayersFromGeom()
-    manager.emit('vertexchange', { numVertices: state.vertices.length })
-    manager.emit('update', store.toGeoJSON(olFeature))
-  }
-
-  // Keep overlay layers in sync on every geometry change (e.g. during pointer drag)
-  const onGeometryChange = () => updateLayersFromGeom()
-  olFeature.getGeometry().on('change', onGeometryChange)
-
-  // --- OL Modify (handles pointer vertex drag + midpoint insertion natively) ---
-  const collection = new Collection([olFeature])
-  const modifyCondition = (mapBrowserEvent) => {
-    if (state.interfaceType === 'touch') {
-      return false
-    }
-    const olPixel = map.getEventPixel(mapBrowserEvent.originalEvent)
-    return findNearest(map, state.vertices, state.midpoints, { x: olPixel[0], y: olPixel[1] }) !== null
-  }
-  const modifyInteraction = new Modify({
-    features: collection,
-    style: () => [], // vertex circles rendered by vertexLayer instead
-    pixelTolerance: 12,
-    // Only activate when clicking on a vertex or midpoint circle, not anywhere on a segment.
-    // Touch drags are handled by touchHandler; returning false here lets them pass through to
-    // DragPan (touchHandler uses preventDefault on the offset target to stop unwanted panning).
-    condition: modifyCondition
-  })
-  map.addInteraction(modifyInteraction)
-
-  // Track move start for undo
-  let modifyStartCoords = null
-
-  modifyInteraction.on('modifystart', () => {
-    if (state.interfaceType === 'touch') {
-      return
-    }
-    modifyStartCoords = state.vertices.map(c => [...c])
-  })
-
-  modifyInteraction.on('modifyend', () => {
-    if (state.interfaceType === 'touch') {
-      return
-    }
-    const prevCoords = modifyStartCoords
-    syncGeom()
-    if (!prevCoords) {
-      return
-    }
-
-    const newCoords = state.vertices
-    if (newCoords.length > prevCoords.length) {
-      // Midpoint drag inserted a vertex — find it and select it
-      const insertedIdx = newCoords.findIndex((c, i) => !prevCoords[i] || c[0] !== prevCoords[i][0])
-      const idx = Math.max(0, insertedIdx)
-      undoStack.push({ type: 'insert_vertex', vertexIndex: idx })
-      setState({ selectedVertexIndex: idx, selectedVertexType: 'vertex' })
-    } else if (newCoords.length === prevCoords.length) {
-      const movedIdx = newCoords.findIndex((c, i) => c[0] !== prevCoords[i][0] || c[1] !== prevCoords[i][1])
-      if (movedIdx >= 0) {
-        undoStack.push({ type: 'move_vertex', vertexIndex: movedIdx, previousCoord: prevCoords[movedIdx] })
-        setState({ selectedVertexIndex: movedIdx, selectedVertexType: 'vertex' })
-      }
-    } else {
-      // no change in vertex count (shouldn't happen, but satisfies linter)
-    }
-    modifyStartCoords = null
-  })
-
-  // --- Vertex + midpoint layers (always-visible handles) ---
-  const midpointLayer = createMidpointLayer(map, manager.styles.midpointStyle)
-  const vertexLayer = createVertexLayer(map, manager.styles.vertexStyle)
-
-  // --- Active selection overlay — always on top of vertex and midpoint layers ---
-  const activeSource = new VectorSource()
-  const activeLayer = new VectorLayer({ source: activeSource, zIndex: 103 })
-  map.addLayer(activeLayer)
-
-  const updateActiveLayer = () => {
-    activeSource.clear()
-    const { selectedVertexIndex, selectedVertexType, vertices, midpoints } = state
-    if (selectedVertexIndex < 0) {
-      return
-    }
-    let coord, style
-    if (selectedVertexType === 'vertex') {
-      coord = vertices[selectedVertexIndex]
-      style = manager.styles.selectedVertexStyle
-    } else if (selectedVertexType === 'midpoint') {
-      coord = midpoints[selectedVertexIndex - vertices.length]
-      style = manager.styles.selectedMidpointStyle
-    } else {
-      return
-    }
-    if (!coord) {
-      return
-    }
-    const f = new Feature({ geometry: new Point(coord) })
-    f.setStyle(style)
-    activeSource.addFeature(f)
-  }
-
-  syncGeom() // initial populate
-
-  // --- Style hot-swap when map style changes ---
-  const onStylesChanged = (styles) => {
-    olFeature.setStyle(styles.editFeatureStyle)
-    vertexLayer.updateStyle(styles.vertexStyle)
-    midpointLayer.updateStyle(styles.midpointStyle)
-    updateActiveLayer()
-    touchHandler.updateColors(manager.colors)
-  }
-  manager.on('styleschanged', onStylesChanged)
-
-  // --- Pointer hit detection ---
-  const onPointerdown = (e) => {
-    if (e.pointerType === 'touch') {
-      state.interfaceType = 'touch'
-      touchHandler.updateTargetPosition()
-      return
-    }
-    state.interfaceType = 'mouse'
-
-    const olPixel = map.getEventPixel(e)
-    const pixel = { x: olPixel[0], y: olPixel[1] }
-    const hit = findNearest(map, state.vertices, state.midpoints, pixel)
-    if (hit?.type === 'vertex') {
-      setState({ selectedVertexIndex: hit.index, selectedVertexType: 'vertex' })
-    }
-  }
-
-  // click fires after OL Modify finishes, so state.vertices reflects any insertions/moves
-  const onContainerClick = (e) => {
-    if (state.interfaceType === 'touch') {
-      return
-    }
-    const olPixel = map.getEventPixel(e)
-    const pixel = { x: olPixel[0], y: olPixel[1] }
-    const hit = findNearest(map, state.vertices, state.midpoints, pixel)
-    if (hit?.type === 'vertex') {
-      setState({ selectedVertexIndex: hit.index, selectedVertexType: 'vertex' })
-    } else if (hit?.type === 'midpoint') {
-      // modifyend already selected the inserted vertex — nothing to do here
-    } else {
-      setState({ selectedVertexIndex: -1, selectedVertexType: null })
-    }
-  }
-
-  // Switch to pointer mode and hide the touch target as soon as the mouse moves.
-  const onPointerMove = (e) => {
-    if (e.pointerType !== 'mouse') {
-      return
-    }
-    if (state.interfaceType === 'mouse') {
-      return
-    }
-    state.interfaceType = 'mouse'
-    touchHandler.hide()
-  }
-
-  container.addEventListener('pointerdown', onPointerdown)
-  container.addEventListener('pointerenter', onPointerMove)
-  container.addEventListener('pointermove', onPointerMove)
-  container.addEventListener('click', onContainerClick)
-
-  // --- Button click (delete vertex) ---
-  const onButtonClick = (e) => {
-    if (deleteVertexButtonId && e.target.closest(`#${deleteVertexButtonId}`)) {
-      doDeleteVertex()
-    }
-  }
-  globalThis.addEventListener('click', onButtonClick)
-
-  // --- Operations ---
-
-  const doDeleteVertex = () => {
-    if (state.selectedVertexType !== 'vertex' || state.selectedVertexIndex < 0) {
-      return
-    }
-    const result = deleteVertex(olFeature, state.selectedVertexIndex)
-    if (!result) {
-      return
-    }
-    undoStack.push({ type: 'delete_vertex', vertexIndex: result.deletedIndex, deletedCoord: result.deletedCoord })
-    syncGeom()
-    setState({ selectedVertexIndex: -1, selectedVertexType: null })
-  }
-
-  const doUndo = () => {
-    const op = undoStack.pop()
-    if (!op) {
-      return
-    }
-    const previousIndex = state.selectedVertexIndex
-    const restoredIndex = applyUndo(olFeature, op)
-    syncGeom()
-    // Only re-select if a vertex was already active — undo must not create a new selection
-    const newIndex = previousIndex >= 0 ? restoredIndex : -1
-    setState({
-      selectedVertexIndex: newIndex,
-      selectedVertexType: newIndex >= 0 ? 'vertex' : null
-    })
-    if (previousIndex >= 0 && newIndex >= 0) {
-      onUpdate?.()
-    }
-  }
-
-  // --- Touch handler ---
-  const touchHandler = createTouchHandler({
-    map,
-    container,
-    getState,
-    setState,
-    colors: manager.colors,
-    snap,
-    onVertexMoved ({ vertexIndex, previousCoord }) {
-      undoStack.push({ type: 'move_vertex', vertexIndex, previousCoord })
-      syncGeom()
-      setState({ selectedVertexIndex: vertexIndex, selectedVertexType: 'vertex' })
-      touchHandler.updateTargetPosition()
-    },
-    onTap (hit) {
-      if (!hit) {
-        setState({ selectedVertexIndex: -1, selectedVertexType: null })
-        return
-      }
-      if (hit.type === 'vertex') {
-        setState({ selectedVertexIndex: hit.index, selectedVertexType: 'vertex' })
-        touchHandler.updateTargetPosition()
-        return
-      }
-      if (hit.type === 'midpoint') {
-        const result = insertAtMidpoint(olFeature, state.midpoints, hit.index, state.vertices.length)
-        if (!result) {
-          return
-        }
-        undoStack.push({ type: 'insert_vertex', vertexIndex: result.insertedIndex })
-        syncGeom()
-        setState({ selectedVertexIndex: result.insertedIndex, selectedVertexType: 'vertex' })
-        touchHandler.updateTargetPosition()
-      }
-    }
-  })
-  onDeselect = () => touchHandler.hide()
-  onUpdate = () => {
-    if (state.interfaceType === 'touch') {
-      touchHandler.updateTargetPosition()
-    }
-  }
-
-  // Reposition the touch target after OL re-renders with the new size.
-  // change:size fires before the render, so we wait for postrender to get
-  // correct pixel coords from getPixelFromCoordinate.
-  const onMapSizeChange = () => {
-    if (state.interfaceType !== 'touch' || state.selectedVertexIndex < 0) {
-      return
-    }
-    map.once('postrender', () => touchHandler.updateTargetPosition())
-  }
-  map.on('change:size', onMapSizeChange)
-
-  // --- Keyboard handler ---
-  const keyboardHandler = createKeyboardHandler({
-    map,
-    getState,
-    setState,
-    snap,
-    onVertexMoved ({ vertexIndex, previousCoord }) {
-      undoStack.push({ type: 'move_vertex', vertexIndex, previousCoord })
-      syncGeom()
-      setState({ selectedVertexIndex: vertexIndex, selectedVertexType: 'vertex' })
-    },
-    onInserted ({ insertedIndex }) {
-      undoStack.push({ type: 'insert_vertex', vertexIndex: insertedIndex })
-      syncGeom()
-    },
-    onDeleted: doDeleteVertex,
-    onUndo: doUndo,
-    onKeyboardActive () {
-      if (state.interfaceType === 'keyboard') {
-        return
-      }
-      state.interfaceType = 'keyboard'
-      touchHandler.hide()
-      container.focus({ preventScroll: true })
-    }
-  })
-
-  return {
-    setInterfaceType (type) {
-      if (type === state.interfaceType) {
-        return
-      }
-      state.interfaceType = type
-      if (type === 'touch') {
-        touchHandler.updateTargetPosition()
-      } else {
-        touchHandler.hide()
-      }
-    },
-
-    done () {
-      manager.emit('editfinish', store.toGeoJSON(olFeature))
-    },
-
-    cancel () {
-      // Restore original feature from store (re-read from initial state)
-      // The original was stored as tempFeature in reducer — events.js handles restore
-    },
-
-    undo: doUndo,
-    deleteVertex: doDeleteVertex,
-
-    destroy () {
-      olFeature.setStyle(originalFeatureStyle)
-      olFeature.getGeometry().un('change', onGeometryChange)
-      manager.off('styleschanged', onStylesChanged)
-      container.removeEventListener('pointerdown', onPointerdown)
-      container.removeEventListener('pointerenter', onPointerMove)
-      container.removeEventListener('pointermove', onPointerMove)
-      container.removeEventListener('click', onContainerClick)
-      globalThis.removeEventListener('click', onButtonClick)
-      map.un('change:size', onMapSizeChange)
-      map.removeInteraction(modifyInteraction)
-      activeSource.clear()
-      map.removeLayer(activeLayer)
-      midpointLayer.remove()
-      vertexLayer.remove()
-      touchHandler.destroy()
-      keyboardHandler.destroy()
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/edit/keyboardHandler.js b/plugins/beta/draw-ol/src/edit/keyboardHandler.js
deleted file mode 100644
index 88dae2157..000000000
--- a/plugins/beta/draw-ol/src/edit/keyboardHandler.js
+++ /dev/null
@@ -1,229 +0,0 @@
-import { coordToPixel, nudgeCoord } from '../utils/olCoords.js'
-import { spatialNavigate } from '../utils/spatial.js'
-import { moveVertex, insertAtMidpoint } from './vertexOps.js'
-
-const ARROW_KEYS = new Set(['ArrowLeft', 'ArrowRight', 'ArrowUp', 'ArrowDown'])
-const INTERACTIVE_TAGS = new Set(['INPUT', 'TEXTAREA', 'BUTTON', 'SELECT', 'A'])
-const NUDGE_PX = 1
-const STEP_PX = 5
-
-const selectNearest = (map, getState, setState) => {
-  const { vertices, midpoints } = getState()
-  if (!vertices.length) {
-    return
-  }
-  const centerCoord = map.getView().getCenter()
-  const centerPx = coordToPixel(map, centerCoord)
-  if (!centerPx) {
-    return
-  }
-  const allPixels = [
-    ...vertices.map(c => coordToPixel(map, c)),
-    ...midpoints.map(c => coordToPixel(map, c))
-  ].filter(Boolean).map(p => [p.x, p.y])
-  const idx = spatialNavigate([centerPx.x, centerPx.y], allPixels, undefined)
-  setState({ selectedVertexIndex: idx, selectedVertexType: idx < vertices.length ? 'vertex' : 'midpoint' })
-}
-
-const navigateTo = (direction, map, getState, setState) => {
-  const { selectedVertexIndex, vertices, midpoints } = getState()
-  if (!vertices.length) {
-    return
-  }
-  const allCoords = [...vertices, ...midpoints]
-  const allPixels = allCoords.map(c => coordToPixel(map, c)).filter(Boolean).map(p => [p.x, p.y])
-  const startPx = selectedVertexIndex >= 0
-    ? allPixels[selectedVertexIndex]
-    : (() => {
-        const c = coordToPixel(map, map.getView().getCenter())
-        return c ? [c.x, c.y] : null
-      })()
-  if (!startPx) {
-    return
-  }
-  const idx = spatialNavigate(startPx, allPixels, direction)
-  setState({ selectedVertexIndex: idx, selectedVertexType: idx < vertices.length ? 'vertex' : 'midpoint' })
-}
-
-// Returns snappedCoord, but escapes snap if it prevents sufficient progress in the nudge direction.
-// Covers vertex-stuck (snap holds position) and edge-hugging (vertex slides along edge).
-const resolveSnappedCoord = (snap, map, current, nudgedCoord, snappedCoord, dx, dy) => {
-  if (!snap) {
-    return snappedCoord
-  }
-  const nudgeVec = [nudgedCoord[0] - current[0], nudgedCoord[1] - current[1]]
-  const actualVec = [snappedCoord[0] - current[0], snappedCoord[1] - current[1]]
-  const nudgeLenSq = nudgeVec[0] ** 2 + nudgeVec[1] ** 2
-  const dot = actualVec[0] * nudgeVec[0] + actualVec[1] * nudgeVec[1]
-  if (nudgeLenSq > 0 && dot / nudgeLenSq < 0.5) {
-    const escapePx = snap.snapRadius + 1
-    return nudgeCoord(map, current, dx === 0 ? 0 : Math.sign(dx) * escapePx, dy === 0 ? 0 : Math.sign(dy) * escapePx)
-  }
-  return snappedCoord
-}
-
-const wireNudge = ({ map, snap, getState, setState, onInserted }) => {
-  const keyMove = { start: null, index: null }
-
-  // Insert the midpoint as a vertex then move it — midpoints stay as midpoints until actually moved.
-  const nudgeMidpoint = (olFeature, midpoints, selectedVertexIndex, vertices, dx, dy) => {
-    const result = insertAtMidpoint(olFeature, midpoints, selectedVertexIndex, vertices.length)
-    if (!result) {
-      return
-    }
-    onInserted({ insertedIndex: result.insertedIndex }) // pushes insert_vertex undo + syncGeom
-    const updatedVertices = getState().vertices
-    const insertedCoord = updatedVertices[result.insertedIndex]
-    if (!insertedCoord) {
-      return
-    }
-    keyMove.start = [...insertedCoord]
-    keyMove.index = result.insertedIndex
-    const nudgedCoord = nudgeCoord(map, insertedCoord, dx, dy)
-    const movedCoord = snap ? snap.apply(nudgedCoord) : nudgedCoord
-    moveVertex(olFeature, result.insertedIndex, movedCoord)
-    setState({
-      selectedVertexIndex: result.insertedIndex,
-      selectedVertexType: 'vertex',
-      vertices: updatedVertices.map((c, i) => i === result.insertedIndex ? movedCoord : c)
-    })
-  }
-
-  const nudge = (e) => {
-    const { selectedVertexIndex, selectedVertexType, vertices, midpoints, olFeature } = getState()
-    if (!olFeature) {
-      return
-    }
-    const step = e.shiftKey ? NUDGE_PX : STEP_PX
-    const offsets = { ArrowUp: [0, -step], ArrowDown: [0, step], ArrowLeft: [-step, 0], ArrowRight: [step, 0] }
-    const [dx, dy] = offsets[e.key]
-    if (selectedVertexType === 'midpoint') {
-      nudgeMidpoint(olFeature, midpoints, selectedVertexIndex, vertices, dx, dy)
-      return
-    }
-    if (selectedVertexIndex < 0 || !vertices[selectedVertexIndex]) {
-      return
-    }
-    const current = vertices[selectedVertexIndex]
-    if (!keyMove.start) {
-      keyMove.start = [...current]
-      keyMove.index = selectedVertexIndex
-    }
-    const nudgedCoord = nudgeCoord(map, current, dx, dy)
-    const snappedCoord = snap ? snap.apply(nudgedCoord) : nudgedCoord
-    snap?.hideIndicator()
-    const newCoord = resolveSnappedCoord(snap, map, current, nudgedCoord, snappedCoord, dx, dy)
-    moveVertex(olFeature, selectedVertexIndex, newCoord)
-    setState({ vertices: vertices.map((c, i) => i === selectedVertexIndex ? newCoord : c) })
-  }
-
-  return { nudge, keyMove }
-}
-
-const isInteractiveElementFocused = (appViewport) => {
-  const el = document.activeElement
-  if (!el || el === document.body) {
-    return false
-  }
-  if (appViewport.contains(el)) {
-    return false
-  }
-  const tag = el.tagName
-  return INTERACTIVE_TAGS.has(tag) || el.isContentEditable || el.hasAttribute('tabindex')
-}
-
-const wireKeyboardEvents = ({ map, snap, getState, setState, onVertexMoved, onInserted, onDeleted, onUndo, onKeyboardActive }) => {
-  const { nudge, keyMove } = wireNudge({ map, snap, getState, setState, onInserted })
-  const appViewport = map.getViewport().closest('[role="application"]') ?? map.getViewport()
-  const isFocused = () => isInteractiveElementFocused(appViewport)
-
-  const handleArrowKey = (e) => {
-    if (e.altKey) {
-      e.preventDefault()
-      e.stopPropagation()
-      navigateTo(e.key, map, getState, setState)
-    } else if (getState().selectedVertexIndex >= 0) {
-      e.preventDefault()
-      e.stopPropagation()
-      nudge(e)
-    } else {
-      // No action: arrow with no selection and no alt modifier
-    }
-  }
-
-  const handleKey = (e) => {
-    onKeyboardActive?.()
-    if (e.key === ' ') {
-      e.preventDefault()
-      if (getState().selectedVertexIndex < 0) {
-        selectNearest(map, getState, setState)
-      }
-    } else if (ARROW_KEYS.has(e.key)) {
-      handleArrowKey(e)
-    } else if (e.key === 'z' && (e.metaKey || e.ctrlKey)) {
-      const tag = document.activeElement?.tagName
-      if (!INTERACTIVE_TAGS.has(tag)) {
-        e.preventDefault()
-        e.stopPropagation()
-        onUndo()
-      }
-    } else {
-      // No action
-    }
-  }
-
-  const onKeydown = (e) => {
-    if (!isFocused()) {
-      if (e.key === 'Escape' && getState().selectedVertexIndex >= 0) {
-        e.preventDefault()
-        keyMove.start = null
-        keyMove.index = null
-        setState({ selectedVertexIndex: -1, selectedVertexType: null })
-      } else {
-        handleKey(e)
-      }
-    }
-  }
-
-  const onKeyup = (e) => {
-    if (!isFocused()) {
-      if (ARROW_KEYS.has(e.key) && keyMove.start && keyMove.index != null) {
-        snap?.hideIndicator()
-        onVertexMoved({ vertexIndex: keyMove.index, previousCoord: keyMove.start })
-        keyMove.start = null
-        keyMove.index = null
-      }
-      if (e.key === 'Delete') {
-        onDeleted()
-      }
-    }
-  }
-
-  window.addEventListener('keydown', onKeydown, { capture: true })
-  window.addEventListener('keyup', onKeyup, { capture: true })
-
-  return {
-    destroy () {
-      window.removeEventListener('keydown', onKeydown, { capture: true })
-      window.removeEventListener('keyup', onKeyup, { capture: true })
-    }
-  }
-}
-
-/**
- * Keyboard handler for edit mode.
- *
- * Space       — select nearest vertex or midpoint to crosshair (only when nothing selected)
- * Alt+Arrow   — navigate to next vertex/midpoint in that direction (requires selection)
- * Arrow       — move selected vertex; if midpoint selected, inserts it as a vertex and moves it
- * Shift+Arrow — same but fine nudge (1px vs 5px)
- * Delete      — delete selected vertex (no-op on midpoints)
- * Ctrl/Cmd+Z  — undo
- *
- * Midpoints remain midpoints until moved — navigating to a midpoint (Space/Alt+Arrow) does not
- * convert it. Only pressing a plain/Shift arrow converts it.
- *
- * @param {{ map, container, getState, setState, onVertexMoved, onInserted, onDeleted, onUndo }}
- * @returns {{ destroy }}
- */
-export const createKeyboardHandler = (options) => wireKeyboardEvents(options)
diff --git a/plugins/beta/draw-ol/src/edit/midpointLayer.js b/plugins/beta/draw-ol/src/edit/midpointLayer.js
deleted file mode 100644
index 34f2358a3..000000000
--- a/plugins/beta/draw-ol/src/edit/midpointLayer.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import VectorSource from 'ol/source/Vector.js'
-import VectorLayer from 'ol/layer/Vector.js'
-import Feature from 'ol/Feature.js'
-import Point from 'ol/geom/Point.js'
-import { getMidpoints } from '../utils/geometryHelpers.js'
-
-/**
- * Manages a dedicated overlay layer for midpoint handles in edit mode.
- * Midpoints are always visible (unlike OL Modify's native midpoints which
- * only appear when the pointer is near a segment). The selected midpoint is
- * rendered by the separate active-selection layer in EditMode (zIndex 103).
- */
-export const createMidpointLayer = (map, midpointStyle) => {
-  let currentStyle = midpointStyle
-  let selectedIndex = -1
-  const source = new VectorSource()
-  const layer = new VectorLayer({
-    source,
-    style: (feature) => feature.get('midpointIndex') === selectedIndex ? null : [currentStyle],
-    zIndex: 101
-  })
-  map.addLayer(layer)
-
-  return {
-    update (geom) {
-      source.clear()
-      const midpoints = getMidpoints(geom)
-      const features = midpoints.map((coord, i) => {
-        const f = new Feature({ geometry: new Point(coord) })
-        f.set('midpointIndex', i)
-        return f
-      })
-      source.addFeatures(features)
-    },
-
-    setSelected (index) {
-      selectedIndex = index
-      source.changed()
-    },
-
-    updateStyle (newMidpointStyle) {
-      currentStyle = newMidpointStyle
-      source.changed()
-    },
-
-    getCoords () {
-      return source.getFeatures()
-        .sort((a, b) => a.get('midpointIndex') - b.get('midpointIndex'))
-        .map(f => f.getGeometry().getCoordinates())
-    },
-
-    remove () {
-      source.clear()
-      map.removeLayer(layer)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/edit/touchHandler.js b/plugins/beta/draw-ol/src/edit/touchHandler.js
deleted file mode 100644
index e7b41ca2f..000000000
--- a/plugins/beta/draw-ol/src/edit/touchHandler.js
+++ /dev/null
@@ -1,171 +0,0 @@
-import { coordToPixel, pixelToCoord } from '../utils/olCoords.js'
-import { createTouchTarget, applyTouchTargetColors, showTouchTarget, hideTouchTarget, isOnTouchTarget } from '../utils/touchTarget.js'
-import { moveVertex } from './vertexOps.js'
-import { findNearest } from './vertexHitTest.js'
-
-const TAP_MOVE_THRESHOLD = 10
-const TAP_TIME_THRESHOLD = 400
-const TOUCH_TOLERANCE = 24
-
-const wireTouchEvents = ({ container, map, targetEl, olToCSS, cssToOl, getState, setState, onVertexMoved, onTap, snap }) => {
-  let dragStartCoord = null
-  let dragStartIndex = null
-  let vertexTouchDelta = null
-  let targetTouchDelta = null
-  let tapStart = null
-
-  const onTouchstart = (e) => {
-    const touch = e.touches[0]
-    const onTarget = isOnTouchTarget(e.target)
-    tapStart = { x: touch.clientX, y: touch.clientY, time: Date.now(), onTarget }
-    if (!onTarget) {
-      return
-    }
-    const { selectedVertexIndex, vertices } = getState()
-    const vertex = vertices[selectedVertexIndex]
-    if (!vertex) {
-      return
-    }
-    const tOl = map.getEventPixel({ clientX: touch.clientX, clientY: touch.clientY })
-    const vertexPx = coordToPixel(map, vertex)
-    const style = getComputedStyle(targetEl)
-    const svgOlPx = cssToOl({ x: Number.parseFloat(style.left), y: Number.parseFloat(style.top) })
-    dragStartCoord = [...vertex]
-    dragStartIndex = selectedVertexIndex
-    vertexTouchDelta = { x: tOl[0] - vertexPx.x, y: tOl[1] - vertexPx.y }
-    targetTouchDelta = { x: tOl[0] - svgOlPx.x, y: tOl[1] - svgOlPx.y }
-    e.preventDefault()
-  }
-
-  const onTouchmove = (e) => {
-    if (!isOnTouchTarget(e.target) || dragStartIndex == null) {
-      return
-    }
-    e.preventDefault()
-    const tOl = map.getEventPixel({ clientX: e.touches[0].clientX, clientY: e.touches[0].clientY })
-    const rawCoord = pixelToCoord(map, { x: tOl[0] - vertexTouchDelta.x, y: tOl[1] - vertexTouchDelta.y })
-    const newCoord = snap ? snap.apply(rawCoord) : rawCoord
-    snap?.hideIndicator()
-    const { olFeature, vertices } = getState()
-    if (!olFeature) {
-      return
-    }
-    moveVertex(olFeature, dragStartIndex, newCoord)
-    setState({ vertices: vertices.map((c, i) => i === dragStartIndex ? newCoord : c) })
-    showTouchTarget(targetEl, olToCSS({ x: tOl[0] - targetTouchDelta.x, y: tOl[1] - targetTouchDelta.y }))
-  }
-
-  const onTouchend = (e) => {
-    const wasDragging = dragStartIndex != null
-    if (!wasDragging) {
-      if (tapStart && !tapStart.onTarget && e.changedTouches.length > 0) {
-        const t = e.changedTouches[0]
-        const dt = Date.now() - tapStart.time
-        if (Math.hypot(t.clientX - tapStart.x, t.clientY - tapStart.y) < TAP_MOVE_THRESHOLD && dt < TAP_TIME_THRESHOLD) {
-          const tOl = map.getEventPixel({ clientX: t.clientX, clientY: t.clientY })
-          const tapState = getState()
-          onTap?.(findNearest(map, tapState.vertices, tapState.midpoints, { x: tOl[0], y: tOl[1] }, TOUCH_TOLERANCE))
-          e.preventDefault()
-        }
-      }
-      tapStart = null
-      return
-    }
-    tapStart = null
-    const { vertices } = getState()
-    if (vertices[dragStartIndex] && dragStartCoord) {
-      onVertexMoved({ vertexIndex: dragStartIndex, previousCoord: dragStartCoord })
-    }
-    snap?.hideIndicator()
-    dragStartCoord = null; dragStartIndex = null; vertexTouchDelta = null; targetTouchDelta = null
-    e.preventDefault()
-  }
-
-  container.addEventListener('touchstart', onTouchstart, { passive: false })
-  container.addEventListener('touchmove', onTouchmove, { passive: false })
-  container.addEventListener('touchend', onTouchend, { passive: false })
-
-  return {
-    isDragging: () => dragStartIndex != null,
-    destroy () {
-      container.removeEventListener('touchstart', onTouchstart)
-      container.removeEventListener('touchmove', onTouchmove)
-      container.removeEventListener('touchend', onTouchend)
-    }
-  }
-}
-
-/**
- * Touch vertex drag handler for edit mode.
- * Shows an SVG offset target below the finger so the vertex can be repositioned
- * without finger occlusion. Tap on a vertex or midpoint selects it via onTap.
- *
- * @param {{ map, container, getState, setState, onVertexMoved, onTap, colors }} options
- * @returns {{ updateTargetPosition, updateColors, hide, destroy }}
- */
-export const createTouchHandler = ({ map, container, getState, setState, onVertexMoved, onTap, colors, snap }) => {
-  const targetEl = createTouchTarget(container)
-  applyTouchTargetColors(targetEl, colors)
-
-  // OL pixel space is relative to ol-viewport at its pre-scale CSS size.
-  // Container CSS space is larger when a CSS transform scales up ol-viewport
-  // (e.g. scale(1.5) at medium map size makes OL pixels 1.5× smaller than CSS pixels).
-  const cssTx = { scale: 1, ox: 0, oy: 0 }
-  const olToCSS = (p) => ({ x: p.x * cssTx.scale + cssTx.ox, y: p.y * cssTx.scale + cssTx.oy })
-  const cssToOl = (p) => ({ x: (p.x - cssTx.ox) / cssTx.scale, y: (p.y - cssTx.oy) / cssTx.scale })
-
-  const syncCssTx = () => {
-    const vpEl = map.getViewport()
-    const vpRect = vpEl.getBoundingClientRect()
-    const cRect = container.getBoundingClientRect()
-    const vpScale = vpEl.offsetWidth > 0 ? vpRect.width / vpEl.offsetWidth : 1
-    const cScale = container.offsetWidth > 0 ? cRect.width / container.offsetWidth : 1
-    Object.assign(cssTx, {
-      scale: vpScale / cScale,
-      ox: (vpRect.left - cRect.left) / cScale,
-      oy: (vpRect.top - cRect.top) / cScale
-    })
-  }
-
-  const touchEvents = wireTouchEvents({ container, map, targetEl, olToCSS, cssToOl, getState, setState, onVertexMoved, onTap, snap })
-
-  const updateTargetPosition = () => {
-    const { selectedVertexIndex, vertices, interfaceType } = getState()
-    if (selectedVertexIndex < 0 || !vertices[selectedVertexIndex] || interfaceType !== 'touch') {
-      hideTouchTarget(targetEl)
-      return
-    }
-    const px = coordToPixel(map, vertices[selectedVertexIndex])
-    if (!px) {
-      hideTouchTarget(targetEl)
-      return
-    }
-    showTouchTarget(targetEl, olToCSS(px))
-  }
-
-  // Reposition on every render — keeps target anchored during pinch-zoom and pan.
-  // Skipped during drag since touchmove handles position directly.
-  const onPostrender = () => {
-    const { selectedVertexIndex, interfaceType } = getState()
-    if (selectedVertexIndex >= 0 && !touchEvents.isDragging() && interfaceType === 'touch') {
-      updateTargetPosition()
-    }
-  }
-  map.on('postrender', onPostrender)
-
-  const onSizeChange = () => { syncCssTx(); map.once('postrender', updateTargetPosition) }
-  map.on('change:size', onSizeChange)
-  syncCssTx()
-
-  return {
-    updateTargetPosition,
-    updateColors (newColors) { applyTouchTargetColors(targetEl, newColors) },
-    hide () { hideTouchTarget(targetEl) },
-    destroy () {
-      map.un('change:size', onSizeChange)
-      map.un('postrender', onPostrender)
-      touchEvents.destroy()
-      hideTouchTarget(targetEl)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/edit/undoOps.js b/plugins/beta/draw-ol/src/edit/undoOps.js
deleted file mode 100644
index 0ae197ad8..000000000
--- a/plugins/beta/draw-ol/src/edit/undoOps.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import {
-  getRingSegments,
-  getSegmentForIndex,
-  getModifiableCoords
-} from '../utils/geometryHelpers.js'
-
-/**
- * Undo handlers for edit mode.
- * Each operation receives the OL feature and the saved op payload,
- * mutates the geometry, and returns the vertex index to re-select (or -1).
- */
-
-export const undoMoveVertex = (olFeature, op) => {
-  const { vertexIndex, previousCoord } = op
-  const geom = olFeature.getGeometry()
-  const geojsonGeom = { type: geom.getType(), coordinates: geom.getCoordinates() }
-  const segments = getRingSegments(geojsonGeom)
-  const result = getSegmentForIndex(segments, vertexIndex)
-  if (!result) {
-    return -1
-  }
-
-  const ring = getModifiableCoords(geojsonGeom, result.segment.path)
-  ring[result.localIdx] = [...previousCoord]
-  if (result.segment.closed && result.localIdx === 0) {
-    ring[ring.length - 1] = [...previousCoord]
-  }
-  geom.setCoordinates(geojsonGeom.coordinates)
-  return vertexIndex
-}
-
-export const undoInsertVertex = (olFeature, op) => {
-  const { vertexIndex } = op
-  const geom = olFeature.getGeometry()
-  const geojsonGeom = { type: geom.getType(), coordinates: geom.getCoordinates() }
-  const segments = getRingSegments(geojsonGeom)
-  const result = getSegmentForIndex(segments, vertexIndex)
-  if (!result) {
-    return -1
-  }
-
-  const ring = getModifiableCoords(geojsonGeom, result.segment.path)
-  ring.splice(result.localIdx, 1)
-  if (result.segment.closed) {
-    ring[ring.length - 1] = [...ring[0]]
-  }
-  geom.setCoordinates(geojsonGeom.coordinates)
-  return -1
-}
-
-export const undoDeleteVertex = (olFeature, op) => {
-  const { vertexIndex, deletedCoord } = op
-  const geom = olFeature.getGeometry()
-  const geojsonGeom = { type: geom.getType(), coordinates: geom.getCoordinates() }
-  const segments = getRingSegments(geojsonGeom)
-
-  let result = getSegmentForIndex(segments, vertexIndex)
-  // Vertex might be at a segment boundary after deletion shifted indices
-  if (!result) {
-    for (const seg of segments) {
-      if (vertexIndex === seg.start + seg.length) {
-        result = { segment: seg, localIdx: seg.length }
-        break
-      }
-    }
-  }
-  if (!result) {
-    return -1
-  }
-
-  const ring = getModifiableCoords(geojsonGeom, result.segment.path)
-  ring.splice(result.localIdx, 0, [...deletedCoord])
-  if (result.segment.closed) {
-    ring[ring.length - 1] = [...ring[0]]
-  }
-  geom.setCoordinates(geojsonGeom.coordinates)
-  return vertexIndex
-}
-
-/**
- * Dispatch the correct undo handler based on operation type.
- * @returns {number} vertex index to re-select after undo, or -1 for none
- */
-export const applyUndo = (olFeature, op) => {
-  switch (op.type) {
-    case 'move_vertex':
-      return undoMoveVertex(olFeature, op)
-    case 'insert_vertex':
-      return undoInsertVertex(olFeature, op)
-    case 'delete_vertex':
-      return undoDeleteVertex(olFeature, op)
-    default:
-      return -1
-  }
-}
diff --git a/plugins/beta/draw-ol/src/edit/vertexHitTest.js b/plugins/beta/draw-ol/src/edit/vertexHitTest.js
deleted file mode 100644
index 34a991d47..000000000
--- a/plugins/beta/draw-ol/src/edit/vertexHitTest.js
+++ /dev/null
@@ -1,72 +0,0 @@
-import { coordToPixel, pixelDist } from '../utils/olCoords.js'
-
-const PIXEL_TOLERANCE = 12
-
-/**
- * Find the nearest vertex to a screen pixel within tolerance.
- *
- * @param {import('ol/Map').default} map
- * @param {number[][]} vertices - flat coordinate array [[e,n], ...]
- * @param {{ x: number, y: number }} pixel
- * @param {number} [tolerance]
- * @returns {{ index: number, type: 'vertex' } | null}
- */
-export const findNearestVertex = (map, vertices, pixel, tolerance = PIXEL_TOLERANCE) => {
-  let bestIdx = -1
-  let bestDist = tolerance
-
-  vertices.forEach((coord, i) => {
-    const px = coordToPixel(map, coord)
-    if (!px) {
-      return
-    }
-    const d = pixelDist(px, pixel)
-    if (d < bestDist) {
-      bestDist = d
-      bestIdx = i
-    }
-  })
-
-  return bestIdx >= 0 ? { index: bestIdx, type: 'vertex' } : null
-}
-
-/**
- * Find the nearest midpoint to a screen pixel within tolerance.
- *
- * @param {import('ol/Map').default} map
- * @param {number[][]} midpoints - midpoint coordinate array
- * @param {{ x: number, y: number }} pixel
- * @param {number} vertexCount - number of actual vertices (midpoint index offset)
- * @param {number} [tolerance]
- * @returns {{ index: number, type: 'midpoint' } | null}
- */
-export const findNearestMidpoint = (map, midpoints, pixel, vertexCount, tolerance = PIXEL_TOLERANCE) => {
-  let bestIdx = -1
-  let bestDist = tolerance
-
-  midpoints.forEach((coord, i) => {
-    const px = coordToPixel(map, coord)
-    if (!px) {
-      return
-    }
-    const d = pixelDist(px, pixel)
-    if (d < bestDist) {
-      bestDist = d
-      bestIdx = i
-    }
-  })
-
-  return bestIdx >= 0 ? { index: vertexCount + bestIdx, type: 'midpoint' } : null
-}
-
-/**
- * Find the nearest vertex or midpoint to a pixel.
- * Vertices take priority when equidistant.
- *
- * @param {number} [tolerance]
- * @returns {{ index: number, type: 'vertex'|'midpoint' } | null}
- */
-export const findNearest = (map, vertices, midpoints, pixel, tolerance = PIXEL_TOLERANCE) => {
-  return findNearestVertex(map, vertices, pixel, tolerance) ??
-    findNearestMidpoint(map, midpoints, pixel, vertices.length, tolerance)
-}
diff --git a/plugins/beta/draw-ol/src/edit/vertexLayer.js b/plugins/beta/draw-ol/src/edit/vertexLayer.js
deleted file mode 100644
index 057acbb02..000000000
--- a/plugins/beta/draw-ol/src/edit/vertexLayer.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import VectorSource from 'ol/source/Vector.js'
-import VectorLayer from 'ol/layer/Vector.js'
-import Feature from 'ol/Feature.js'
-import Point from 'ol/geom/Point.js'
-import { getCoords } from '../utils/geometryHelpers.js'
-
-/**
- * Always-visible vertex handle layer for edit mode.
- * OL Modify's built-in vertex handles only appear on hover; this layer
- * keeps circles visible at all times. The selected vertex is rendered by
- * the separate active-selection layer in EditMode (zIndex 103).
- */
-export const createVertexLayer = (map, vertexStyle) => {
-  let currentStyle = vertexStyle
-  let selectedIndex = -1
-  const source = new VectorSource()
-  const layer = new VectorLayer({
-    source,
-    style: (feature) => feature.get('vertexIndex') === selectedIndex ? null : [currentStyle],
-    zIndex: 102
-  })
-  map.addLayer(layer)
-
-  return {
-    update (geom) {
-      source.clear()
-      getCoords(geom).forEach((coord, i) => {
-        const f = new Feature({ geometry: new Point(coord) })
-        f.set('vertexIndex', i)
-        source.addFeature(f)
-      })
-    },
-
-    setSelected (index) {
-      selectedIndex = index
-      source.changed()
-    },
-
-    updateStyle (newVertexStyle) {
-      currentStyle = newVertexStyle
-      source.changed()
-    },
-
-    remove () {
-      source.clear()
-      map.removeLayer(layer)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/edit/vertexOps.js b/plugins/beta/draw-ol/src/edit/vertexOps.js
deleted file mode 100644
index e35b9cdb6..000000000
--- a/plugins/beta/draw-ol/src/edit/vertexOps.js
+++ /dev/null
@@ -1,99 +0,0 @@
-import {
-  getCoords,
-  getRingSegments,
-  getSegmentForIndex,
-  getModifiableCoords
-} from '../utils/geometryHelpers.js'
-
-/**
- * Delete the vertex at `selectedIndex` from the OL feature's geometry.
- * Respects minimum vertex counts (3 for closed rings, 2 for lines).
- *
- * @returns {{ deletedIndex: number, deletedCoord: number[] } | null} undo payload, or null if not deleted
- */
-export const deleteVertex = (olFeature, selectedIndex) => {
-  const geom = olFeature.getGeometry()
-  const geojsonGeom = { type: geom.getType(), coordinates: geom.getCoordinates() }
-  const coords = getCoords(geojsonGeom)
-  const segments = getRingSegments(geojsonGeom)
-  const result = getSegmentForIndex(segments, selectedIndex)
-  if (!result) {
-    return null
-  }
-
-  const { segment } = result
-  const minVertices = segment.closed ? 3 : 2
-  if (segment.length <= minVertices) {
-    return null
-  }
-
-  const deletedCoord = [...coords[selectedIndex]]
-  const ring = getModifiableCoords(geojsonGeom, segment.path)
-  ring.splice(result.localIdx, 1)
-  if (segment.closed) {
-    ring[ring.length - 1] = [...ring[0]]
-  }
-
-  geom.setCoordinates(geojsonGeom.coordinates)
-  return { deletedIndex: selectedIndex, deletedCoord }
-}
-
-/**
- * Insert a vertex after `afterIndex` in the OL feature's geometry.
- * Used when the user activates a midpoint (touch tap or keyboard insert).
- *
- * @param {number[][]} midpoints - current midpoint array (from midpointLayer)
- * @param {number} midpointFlatIndex - flat index (vertexCount + midpointOffset)
- * @param {number} vertexCount - number of actual vertices
- * @param {number[][]} vertices - current vertex array
- * @returns {{ insertedIndex: number } | null}
- */
-export const insertAtMidpoint = (olFeature, midpoints, midpointFlatIndex, vertexCount) => {
-  const midpointLocalIdx = midpointFlatIndex - vertexCount
-  const midCoord = midpoints[midpointLocalIdx]
-  if (!midCoord) {
-    return null
-  }
-
-  const geom = olFeature.getGeometry()
-  const geojsonGeom = { type: geom.getType(), coordinates: geom.getCoordinates() }
-  const segments = getRingSegments(geojsonGeom)
-
-  // Map midpoint local index to insertion position in the coordinate array
-  let midpointCounter = 0
-  for (const seg of segments) {
-    const segMidpoints = seg.closed ? seg.length : seg.length - 1
-    if (midpointLocalIdx < midpointCounter + segMidpoints) {
-      const localMidIdx = midpointLocalIdx - midpointCounter
-      const insertLocalIdx = localMidIdx + 1
-      const insertGlobalIdx = seg.start + insertLocalIdx
-      const ring = getModifiableCoords(geojsonGeom, seg.path)
-      ring.splice(insertLocalIdx, 0, [...midCoord])
-      geom.setCoordinates(geojsonGeom.coordinates)
-      return { insertedIndex: insertGlobalIdx }
-    }
-    midpointCounter += segMidpoints
-  }
-
-  return null
-}
-
-/**
- * Move vertex at `index` to `newCoord` in the OL feature's geometry.
- */
-export const moveVertex = (olFeature, index, newCoord) => {
-  const geom = olFeature.getGeometry()
-  const geojsonGeom = { type: geom.getType(), coordinates: geom.getCoordinates() }
-  const segments = getRingSegments(geojsonGeom)
-  const result = getSegmentForIndex(segments, index)
-  if (!result) {
-    return
-  }
-
-  const ring = getModifiableCoords(geojsonGeom, result.segment.path)
-  ring[result.localIdx] = [...newCoord]
-  if (result.segment.closed && result.localIdx === 0) {
-    ring[ring.length - 1] = [...newCoord]
-  }
-  geom.setCoordinates(geojsonGeom.coordinates)
-}
diff --git a/plugins/beta/draw-ol/src/events.js b/plugins/beta/draw-ol/src/events.js
deleted file mode 100644
index ad232b750..000000000
--- a/plugins/beta/draw-ol/src/events.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Button and manager event wiring for the OL draw plugin.
- * Mirrors draw-ml/events.js structure but uses manager.on/off instead of map.on/off.
- */
-export function attachEvents ({ pluginState, mapProvider, buttonConfig, eventBus }) {
-  const { drawDone, drawCancel, drawUndo, drawDeletePoint, drawSnap } = buttonConfig
-  const { draw } = mapProvider
-  const { dispatch, feature, tempFeature } = pluginState
-
-  const resetState = () => {
-    draw.undoStack.clear()
-    dispatch({ type: 'SET_MODE', payload: null })
-    dispatch({ type: 'SET_FEATURE', payload: { feature: null, tempFeature: null } })
-  }
-
-  // --- Button handlers ---
-
-  const handleDone = () => {
-    draw.undoStack.clear()
-    draw.done()
-  }
-
-  const handleCancel = () => {
-    const mode = draw.getMode()
-    if (mode === 'edit_vertex' && tempFeature?.id) {
-      // Restore original geometry by re-adding the pre-edit feature
-      draw.add(feature)
-    }
-    draw.cancel()
-    resetState()
-    eventBus.emit('draw:cancelled', feature)
-  }
-
-  const handleUndo = () => {
-    draw.undo()
-  }
-
-  const handleDeleteVertex = () => {
-    draw.deleteVertex()
-  }
-
-  const handleSnap = () => {
-    const newSnapState = !pluginState.snap
-    dispatch({ type: 'TOGGLE_SNAP' })
-    draw.snap?.setActive(newSnapState)
-  }
-
-  // --- Manager event handlers ---
-
-  const onCreate = (geojsonFeature) => {
-    resetState()
-    draw.changeMode('disabled')
-    eventBus.emit('draw:created', geojsonFeature)
-  }
-
-  const onEditFinish = (geojsonFeature) => {
-    resetState()
-    draw.changeMode('disabled')
-    eventBus.emit('draw:edited', geojsonFeature)
-  }
-
-  const onCancel = () => {
-    // Fired by draw.cancel() / drawabort — only when not user-initiated via button
-  }
-
-  const onVertexSelection = (e) => {
-    dispatch({ type: 'SET_SELECTED_VERTEX_INDEX', payload: e })
-    eventBus.emit('draw:vertexselection', e)
-  }
-
-  const onVertexChange = (e) => {
-    dispatch({ type: 'SET_SELECTED_VERTEX_INDEX', payload: { index: -1, numVertices: e.numVertices } })
-  }
-
-  const onUndoChange = (length) => {
-    dispatch({ type: 'SET_UNDO_STACK_LENGTH', payload: length })
-  }
-
-  const onUpdate = (geojsonFeature) => {
-    eventBus.emit('draw:updated', geojsonFeature)
-  }
-
-  // --- Wire up ---
-
-  drawDone.onClick = handleDone
-  drawCancel.onClick = handleCancel
-  drawUndo.onClick = handleUndo
-  if (drawDeletePoint) drawDeletePoint.onClick = handleDeleteVertex
-  if (drawSnap) drawSnap.onClick = handleSnap
-
-  draw.on('create', onCreate)
-  draw.on('editfinish', onEditFinish)
-  draw.on('cancel', onCancel)
-  draw.on('vertexselection', onVertexSelection)
-  draw.on('vertexchange', onVertexChange)
-  draw.on('undochange', onUndoChange)
-  draw.on('update', onUpdate)
-
-  return () => {
-    drawDone.onClick = null
-    drawCancel.onClick = null
-    drawUndo.onClick = null
-    if (drawDeletePoint) drawDeletePoint.onClick = null
-    if (drawSnap) drawSnap.onClick = null
-
-    draw.off('create', onCreate)
-    draw.off('editfinish', onEditFinish)
-    draw.off('cancel', onCancel)
-    draw.off('vertexselection', onVertexSelection)
-    draw.off('vertexchange', onVertexChange)
-    draw.off('undochange', onUndoChange)
-    draw.off('update', onUpdate)
-  }
-}
diff --git a/plugins/beta/draw-ol/src/index.js b/plugins/beta/draw-ol/src/index.js
deleted file mode 100644
index 0b7cf6762..000000000
--- a/plugins/beta/draw-ol/src/index.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import './draw.scss'
-
-export default function createPlugin (options = {}) {
-  return {
-    ...options,
-    id: 'draw',
-    load: async () => {
-      const module = (await import(/* webpackChunkName: "im-draw-ol-plugin" */ './manifest.js')).manifest
-      return module
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/manifest.js b/plugins/beta/draw-ol/src/manifest.js
deleted file mode 100644
index e5bcb16b5..000000000
--- a/plugins/beta/draw-ol/src/manifest.js
+++ /dev/null
@@ -1,125 +0,0 @@
-import { initialState, actions } from './reducer.js'
-import { DrawInit } from './DrawInit.jsx'
-import { newPolygon } from './api/newPolygon.js'
-import { newLine } from './api/newLine.js'
-import { editFeature } from './api/editFeature.js'
-import { addFeature } from './api/addFeature.js'
-import { deleteFeature } from './api/deleteFeature.js'
-
-const createButtonSlots = (showLabel) => ({
-  mobile: { slot: 'actions', showLabel },
-  tablet: { slot: 'actions', showLabel },
-  desktop: { slot: 'actions', showLabel }
-})
-
-export const manifest = {
-  reducer: {
-    initialState,
-    actions
-  },
-
-  InitComponent: DrawInit,
-
-  buttons: [
-    {
-      id: 'drawCancel',
-      label: 'Cancel',
-      variant: 'tertiary',
-      hiddenWhen: ({ pluginState }) => !pluginState.mode,
-      ...createButtonSlots(true)
-    },
-    {
-      id: 'drawAddPoint',
-      label: 'Add point',
-      variant: 'primary',
-      hiddenWhen: ({ appState, pluginState }) =>
-        !['draw_polygon', 'draw_line'].includes(pluginState.mode) || appState.interfaceType !== 'touch',
-      ...createButtonSlots(true)
-    },
-    {
-      id: 'drawDone',
-      label: 'Done',
-      variant: 'primary',
-      hiddenWhen: ({ pluginState }) => !['draw_polygon', 'draw_line', 'edit_vertex'].includes(pluginState.mode),
-      enableWhen: ({ pluginState }) => {
-        if (pluginState.mode === 'draw_polygon') {
-          return pluginState.numVertices >= 3 // NOSONAR
-        }
-        if (pluginState.mode === 'draw_line') {
-          return pluginState.numVertices >= 2 // NOSONAR
-        }
-        if (pluginState.mode === 'edit_vertex') {
-          return true
-        }
-        return false
-      },
-      ...createButtonSlots(true)
-    },
-    {
-      id: 'drawMenu',
-      label: 'Menu',
-      iconId: 'menu',
-      hiddenWhen: ({ pluginState }) => !['draw_polygon', 'draw_line', 'edit_vertex'].includes(pluginState.mode),
-      menuItems: [{
-        id: 'drawUndo',
-        label: 'Undo',
-        iconId: 'undo',
-        hiddenWhen: ({ pluginState }) => !['draw_polygon', 'draw_line', 'edit_vertex'].includes(pluginState.mode),
-        enableWhen: ({ pluginState }) => {
-          if (['draw_polygon', 'draw_line'].includes(pluginState.mode)) {
-            return pluginState.numVertices > 0
-          }
-          return pluginState.undoStackLength > 0
-        }
-      }, {
-        id: 'drawSnap',
-        label: 'Snap to feature',
-        iconId: 'magnet',
-        hiddenWhen: ({ pluginState }) => !pluginState.mode || !pluginState.hasSnapLayers,
-        pressedWhen: ({ pluginState }) => !!pluginState.snap
-      }, {
-        id: 'drawDeletePoint',
-        label: 'Delete point',
-        iconId: 'trash',
-        enableWhen: ({ pluginState }) => {
-          if (pluginState.selectedVertexIndex < 0) { return false }
-          const isPolygon = pluginState.feature?.geometry?.type === 'Polygon'
-          return isPolygon ? pluginState.numVertices > 3 : pluginState.numVertices > 2 // NOSONAR
-        },
-        hiddenWhen: ({ pluginState }) => pluginState.mode !== 'edit_vertex'
-      }],
-      mobile: { slot: 'bottom-right' },
-      tablet: { slot: 'top-middle' },
-      desktop: { slot: 'top-middle' }
-    }
-  ],
-
-  keyboardShortcuts: [{
-    id: 'drawStart',
-    group: 'Drawing',
-    title: 'Edit vertex',
-    command: '<kbd>Spacebar</kbd></dd>'
-  }],
-
-  icons: [{
-    id: 'menu',
-    svgContent: '<path d="m6 9 6 6 6-6"/>'
-  }, {
-    id: 'undo',
-    svgContent: '<path d="M9 14 4 9l5-5"/><path d="M4 9h10.5a5.5 5.5 0 0 1 5.5 5.5a5.5 5.5 0 0 1-5.5 5.5H11"/>'
-  }, {
-    id: 'magnet',
-    svgContent: '<path d="m12 15 4 4"/><path d="M2.352 10.648a1.205 1.205 0 0 0 0 1.704l2.296 2.296a1.205 1.205 0 0 0 1.704 0l6.029-6.029a1 1 0 1 1 3 3l-6.029 6.029a1.205 1.205 0 0 0 0 1.704l2.296 2.296a1.205 1.205 0 0 0 1.704 0l6.365-6.367A1 1 0 0 0 8.716 4.282z"/><path d="m5 8 4 4"/>'
-  }, {
-    id: 'trash',
-    svgContent: '<path d="M10 11v6"/><path d="M14 11v6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M3 6h18"/><path d="M8 6V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/>'
-  }],
-
-  api: {
-    newPolygon,
-    newLine,
-    editFeature,
-    addFeature,
-    deleteFeature
-  }
-}
diff --git a/plugins/beta/draw-ol/src/olDraw.js b/plugins/beta/draw-ol/src/olDraw.js
deleted file mode 100644
index 73c966f33..000000000
--- a/plugins/beta/draw-ol/src/olDraw.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { OLDrawManager } from './core/OLDrawManager.js'
-
-/**
- * Creates the OLDrawManager, attaches it to mapProvider, and wires
- * app-level events (MAP_SET_SIZE for scale-aware touch targets,
- * MAP_SET_STYLE for dynamic color updates).
- *
- * @returns {{ remove: () => void }}
- */
-export const createOLDraw = ({ mapProvider, events, eventBus, pluginConfig = {}, mapStyle = null }) => {
-  const { map } = mapProvider
-  const manager = new OLDrawManager(map, pluginConfig)
-
-  if (mapStyle) {
-    manager.setMapStyle(mapStyle)
-  }
-
-  mapProvider.draw = manager
-
-  const handleSetMapSize = (size) => {
-    mapProvider.drawScale = { small: 1, medium: 1.5, large: 2 }[size] ?? 1
-  }
-  eventBus.on(events.MAP_SET_SIZE, handleSetMapSize)
-
-  const handleSetMapStyle = (newMapStyle) => {
-    manager.setMapStyle(newMapStyle)
-  }
-  eventBus.on(events.MAP_SET_STYLE, handleSetMapStyle)
-
-  return {
-    remove () {
-      eventBus.off(events.MAP_SET_SIZE, handleSetMapSize)
-      eventBus.off(events.MAP_SET_STYLE, handleSetMapStyle)
-      manager.remove()
-      mapProvider.draw = null
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/reducer.js b/plugins/beta/draw-ol/src/reducer.js
deleted file mode 100644
index 52af37537..000000000
--- a/plugins/beta/draw-ol/src/reducer.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const initialState = {
-  mode: null,
-  feature: null,
-  tempFeature: null,
-  selectedVertexIndex: -1,
-  numVertices: null,
-  undoStackLength: 0,
-  snap: false,
-  hasSnapLayers: false
-}
-
-const setMode = (state, payload) => ({ ...state, mode: payload, numVertices: null })
-
-const setFeature = (state, payload) => ({
-  ...state,
-  feature: payload.feature === undefined ? state.feature : payload.feature,
-  tempFeature: payload.tempFeature === undefined ? state.tempFeature : payload.tempFeature
-})
-
-const setSelectedVertexIndex = (state, payload) => ({
-  ...state,
-  selectedVertexIndex: payload.index,
-  numVertices: payload.numVertices
-})
-
-const setUndoStackLength = (state, payload) => ({ ...state, undoStackLength: payload })
-
-const toggleSnap = (state) => ({ ...state, snap: !state.snap })
-
-const setHasSnapLayers = (state, payload) => ({ ...state, hasSnapLayers: !!payload })
-
-const actions = {
-  SET_MODE: setMode,
-  SET_FEATURE: setFeature,
-  SET_SELECTED_VERTEX_INDEX: setSelectedVertexIndex,
-  SET_UNDO_STACK_LENGTH: setUndoStackLength,
-  TOGGLE_SNAP: toggleSnap,
-  SET_HAS_SNAP_LAYERS: setHasSnapLayers
-}
-
-export { initialState, actions }
diff --git a/plugins/beta/draw-ol/src/snap/snapEngine.js b/plugins/beta/draw-ol/src/snap/snapEngine.js
deleted file mode 100644
index 35b7f7039..000000000
--- a/plugins/beta/draw-ol/src/snap/snapEngine.js
+++ /dev/null
@@ -1,153 +0,0 @@
-import { transform as projTransform } from 'ol/proj.js'
-import VectorLayer from 'ol/layer/Vector.js'
-import VectorTileLayer from 'ol/layer/VectorTile.js'
-import { testOLFeature, testRenderFeature } from './snapGeometry.js'
-
-// VectorTile features are clipped to tile extents, producing artificial straight edges at tile
-// boundaries. MVT tiles also carry a buffer region (geometry from adjacent tiles extending
-// past the tile boundary). Both the exact boundary and the buffer zone must be filtered.
-// Standard MVT buffer is 128 out of 4096 tile coordinate units.
-const TILE_BOUNDARY_EPS = 1 // source-projection units of margin beyond the buffer
-const MVT_BUFFER_UNITS = 128
-const MVT_TILE_EXTENT = 4096
-
-const buildTileBoundaryState = (layer, map) => {
-  const source = layer.getSource()
-  const tileGrid = source?.getTileGrid()
-  if (!tileGrid) { return null }
-  const viewProj = map.getView().getProjection()
-  const sourceProj = source.getProjection() ?? viewProj
-  const zoom = tileGrid.getZForResolution(map.getView().getResolution(), 0)
-  return { tileGrid, viewProj, sourceProj, zoom }
-}
-
-const isOnTileBoundary = (state, coord) => {
-  if (!state) { return false }
-  const { tileGrid, viewProj, sourceProj, zoom } = state
-  const c = projTransform(coord, viewProj, sourceProj)
-  const tileCoord = tileGrid.getTileCoordForCoordAndZ(c, zoom)
-  const [minX, minY, maxX, maxY] = tileGrid.getTileCoordExtent(tileCoord)
-  // Buffer zone in source projection: edges within this distance of a tile boundary are
-  // MVT buffer clip artefacts (geometry from the adjacent tile included for rendering overlap).
-  const tileBuffer = (maxX - minX) * (MVT_BUFFER_UNITS / MVT_TILE_EXTENT)
-  const eps = tileBuffer + TILE_BOUNDARY_EPS
-  return (
-    Math.abs(c[0] - minX) < eps ||
-    Math.abs(c[0] - maxX) < eps ||
-    Math.abs(c[1] - minY) < eps ||
-    Math.abs(c[1] - maxY) < eps
-  )
-}
-
-// Two same-style fill polygons share an invisible boundary — snapping to it is confusing.
-// Detect this by projecting a test point slightly past the snap position (away from the cursor)
-// and checking whether the same fill layer covers that side too.
-// If it does → same-style invisible boundary → skip.
-// If not (empty space, road, different layer) → visible outer edge → include.
-const INVISIBLE_FILL_MIN_DIST_SQ = 1 // (1m)² — below this, cursor is on the edge, skip direction check
-
-const isInvisibleFillBoundary = (edgeCoord, cursorCoord, layerId, map, vtLayers, resolution) => {
-  const dx = edgeCoord[0] - cursorCoord[0]
-  const dy = edgeCoord[1] - cursorCoord[1]
-  const distSq = dx * dx + dy * dy
-  if (distSq < INVISIBLE_FILL_MIN_DIST_SQ) { return false }
-  const dist = Math.sqrt(distSq)
-  const step = resolution * 4
-  const testCoord = [edgeCoord[0] + (dx / dist) * step, edgeCoord[1] + (dy / dist) * step]
-  const testPixel = map.getPixelFromCoordinate(testCoord)
-  if (!testPixel) { return false }
-  return !!map.forEachFeatureAtPixel(
-    testPixel,
-    (f) => f.get('mapbox-layer')?.id === layerId,
-    { hitTolerance: 2, layerFilter: (l) => vtLayers.includes(l) }
-  )
-}
-
-const pickBest = (a, b) => {
-  if (!b) { return a }
-  if (!a) { return b }
-  if (a.type === 'vertex' && b.type === 'edge') { return a }
-  if (a.type === 'edge' && b.type === 'vertex') { return b }
-  return b.distSq < a.distSq ? b : a
-}
-
-// Collected on each query — VectorTileLayers are replaced when the map style changes
-const getVTLayers = (map) => {
-  const layers = []
-  map.getLayers().forEach(l => {
-    if (l instanceof VectorTileLayer) { layers.push(l) }
-  })
-  return layers
-}
-
-export const createSnapEngine = (map, snapLayers = []) => {
-  let vtLayerNames = new Set()
-  let olLayers = []
-
-  const setLayers = (layers) => {
-    vtLayerNames = new Set()
-    olLayers = []
-    for (const entry of layers ?? []) {
-      if (typeof entry === 'string') {
-        vtLayerNames.add(entry)
-      } else if (entry instanceof VectorLayer) {
-        olLayers.push(entry)
-      } else {
-        // unsupported layer type — skip
-      }
-    }
-  }
-
-  setLayers(snapLayers)
-
-  const query = (coord, radiusPx) => {
-    const resolution = map.getView().getResolution()
-    if (!resolution) { return null }
-    const toleranceMapUnits = radiusPx * resolution
-    const toleranceSq = toleranceMapUnits * toleranceMapUnits
-    const ext = [
-      coord[0] - toleranceMapUnits,
-      coord[1] - toleranceMapUnits,
-      coord[0] + toleranceMapUnits,
-      coord[1] + toleranceMapUnits
-    ]
-
-    let best = null
-
-    for (const layer of olLayers) {
-      const source = layer.getSource()
-      if (!source) { continue }
-      for (const feature of source.getFeaturesInExtent(ext)) {
-        best = pickBest(best, testOLFeature(feature, coord, toleranceSq))
-      }
-    }
-
-    if (vtLayerNames.size > 0) {
-      const vtLayers = getVTLayers(map)
-      const pixel = vtLayers.length > 0 ? map.getPixelFromCoordinate(coord) : null
-      if (pixel) {
-        const tileBoundaryStates = new Map()
-        map.forEachFeatureAtPixel(
-          pixel,
-          (feature, layer) => {
-            const mapboxLayer = feature.get('mapbox-layer')
-            if (!vtLayerNames.has(mapboxLayer?.id)) { return }
-            const candidate = testRenderFeature(feature, coord, toleranceSq)
-            if (!candidate) { return }
-            if (!tileBoundaryStates.has(layer)) {
-              tileBoundaryStates.set(layer, buildTileBoundaryState(layer, map))
-            }
-            if (isOnTileBoundary(tileBoundaryStates.get(layer), candidate.coord)) { return }
-            if (candidate.type === 'edge' && mapboxLayer?.type === 'fill' && isInvisibleFillBoundary(candidate.coord, coord, mapboxLayer.id, map, vtLayers, resolution)) { return }
-            best = pickBest(best, candidate)
-          },
-          { hitTolerance: radiusPx, layerFilter: (l) => vtLayers.includes(l) }
-        )
-      }
-    }
-
-    return best ? { type: best.type, coord: best.coord } : null
-  }
-
-  return { query, setLayers }
-}
diff --git a/plugins/beta/draw-ol/src/snap/snapGeometry.js b/plugins/beta/draw-ol/src/snap/snapGeometry.js
deleted file mode 100644
index 16aecebd4..000000000
--- a/plugins/beta/draw-ol/src/snap/snapGeometry.js
+++ /dev/null
@@ -1,177 +0,0 @@
-const dist2 = (a, b) => {
-  const dx = a[0] - b[0]
-  const dy = a[1] - b[1]
-  return dx * dx + dy * dy
-}
-
-const closestPointOnSegment = (p, a, b) => {
-  const dx = b[0] - a[0]
-  const dy = b[1] - a[1]
-  const lenSq = dx * dx + dy * dy
-  if (lenSq === 0) {
-    return [a[0], a[1]]
-  }
-  const t = Math.max(0, Math.min(1, ((p[0] - a[0]) * dx + (p[1] - a[1]) * dy) / lenSq))
-  return [a[0] + t * dx, a[1] + t * dy]
-}
-
-const bestOf = (current, candidate) => better(current, candidate) ? candidate : current
-
-const better = (a, b) => {
-  if (!a) {
-    return !!b
-  }
-  if (!b) {
-    return false
-  }
-  // Vertex always beats edge — only compare distance within the same type
-  if (a.type === 'edge' && b.type === 'vertex') {
-    return true
-  }
-  if (a.type === 'vertex' && b.type === 'edge') {
-    return false
-  }
-  return b.distSq < a.distSq
-}
-
-// OL Vector rings duplicate the first coord as last; VectorTile rings do not.
-// isClosedRing=true: skip the duplicated last vertex, wrap closing edge back to first.
-const testCoords = (coords, query, toleranceSq, isClosedRing) => {
-  let best = null
-  const n = isClosedRing && coords.length > 1 ? coords.length - 1 : coords.length
-  const edgeCount = isClosedRing ? n : n - 1
-
-  for (let i = 0; i < n; i++) {
-    const v = coords[i]
-    const dSq = dist2(query, v)
-    if (dSq <= toleranceSq) {
-      best = bestOf(best, { type: 'vertex', coord: [v[0], v[1]], distSq: dSq })
-    }
-  }
-
-  for (let i = 0; i < edgeCount; i++) {
-    const a = coords[i]
-    const b = coords[(i + 1) % n]
-    const pt = closestPointOnSegment(query, a, b)
-    const dSq = dist2(query, pt)
-    if (dSq <= toleranceSq) {
-      best = bestOf(best, { type: 'edge', coord: pt, distSq: dSq })
-    }
-  }
-
-  return best
-}
-
-const getBestEdge = (flat, start, numPairs, edgeCount, query, toleranceSq) => {
-  let best = null
-  for (let i = 0; i < edgeCount; i++) {
-    const ai = start + i * 2
-    const bi = start + ((i + 1) % numPairs) * 2
-    const a = [flat[ai], flat[ai + 1]]
-    const b = [flat[bi], flat[bi + 1]]
-    const pt = closestPointOnSegment(query, a, b)
-    const dSq = dist2(query, pt)
-    if (dSq <= toleranceSq) {
-      best = bestOf(best, { type: 'edge', coord: pt, distSq: dSq })
-    }
-  }
-  return best
-}
-
-const getBestVertex = (flat, start, numPairs, query, toleranceSq) => {
-  let best = null
-  for (let i = 0; i < numPairs; i++) {
-    const xi = start + i * 2
-    const v = [flat[xi], flat[xi + 1]]
-    const dSq = dist2(query, v)
-    if (dSq <= toleranceSq) {
-      best = bestOf(best, { type: 'vertex', coord: v, distSq: dSq })
-    }
-  }
-  return best
-}
-
-const getBestPair = (flat, start, numPairs, edgeCount, query, toleranceSq) => {
-  return bestOf(
-    getBestVertex(flat, start, numPairs, query, toleranceSq),
-    getBestEdge(flat, start, numPairs, edgeCount, query, toleranceSq)
-  )
-}
-
-const testFlatCoords = (flat, start, end, query, toleranceSq, isClosedRing) => {
-  const numPairs = (end - start) / 2
-  const edgeCount = isClosedRing ? numPairs : numPairs - 1
-  return getBestPair(flat, start, numPairs, edgeCount, query, toleranceSq)
-}
-
-const olGeomHandlers = {
-  point: (geom, query, toleranceSq) => {
-    const c = geom.getCoordinates()
-    const dSq = dist2(query, c)
-    return dSq <= toleranceSq ? { type: 'vertex', coord: [c[0], c[1]], distSq: dSq } : null
-  },
-  lineString: (geom, query, toleranceSq) => {
-    return testCoords(geom.getCoordinates(), query, toleranceSq, false)
-  },
-  linearRing: (geom, query, toleranceSq) => {
-    return testCoords(geom.getCoordinates(), query, toleranceSq, true)
-  },
-  polygon: (geom, query, toleranceSq) => {
-    let best = null
-    for (const ring of geom.getCoordinates()) {
-      best = bestOf(best, testCoords(ring, query, toleranceSq, true))
-    }
-    return best
-  },
-  multiLineString: (geom, query, toleranceSq) => {
-    let best = null
-    for (const line of geom.getCoordinates()) {
-      best = bestOf(best, testCoords(line, query, toleranceSq, false))
-    }
-    return best
-  },
-  multiPolygon: (geom, query, toleranceSq) => {
-    let best = null
-    for (const polygon of geom.getCoordinates()) {
-      for (const ring of polygon) {
-        best = bestOf(best, testCoords(ring, query, toleranceSq, true))
-      }
-    }
-    return best
-  }
-}
-
-export const testOLFeature = (feature, query, toleranceSq) => {
-  const geom = feature.getGeometry()
-  if (!geom) { return null }
-  const rawType = geom.getType()
-  const handler = olGeomHandlers[rawType[0].toLowerCase() + rawType.slice(1)]
-  return handler ? handler(geom, query, toleranceSq) : null
-}
-
-export const testRenderFeature = (feature, query, toleranceSq) => {
-  const type = feature.getType()
-  const flat = feature.getFlatCoordinates()
-  let best = null
-
-  if (type === 'Point') {
-    const dSq = dist2(query, flat)
-    if (dSq <= toleranceSq) {
-      best = { type: 'vertex', coord: [flat[0], flat[1]], distSq: dSq }
-    }
-  } else if (type === 'LineString') {
-    best = testFlatCoords(flat, 0, flat.length, query, toleranceSq, false)
-  } else if (type === 'Polygon' || type === 'MultiLineString') {
-    const ends = feature.getEnds()
-    let start = 0
-    const isClosedRing = type === 'Polygon'
-    for (const end of ends) {
-      best = bestOf(best, testFlatCoords(flat, start, end, query, toleranceSq, isClosedRing))
-      start = end
-    }
-  } else {
-    // MultiPoint / unknown — no snap candidates
-  }
-
-  return best
-}
diff --git a/plugins/beta/draw-ol/src/snap/snapIndicator.js b/plugins/beta/draw-ol/src/snap/snapIndicator.js
deleted file mode 100644
index de75e26ff..000000000
--- a/plugins/beta/draw-ol/src/snap/snapIndicator.js
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Snap indicator — a single OL VectorLayer that shows a circle at the active
- * snap candidate position.
- *
- * Vertex snap → orange semi-transparent circle (snapVertex color)
- * Edge snap   → blue semi-transparent circle (snapEdge color)
- *
- * Uses Style.renderer (single canvas call) so the circle renders correctly
- * at fractional CSS scale factors.
- */
-
-import VectorLayer from 'ol/layer/Vector.js'
-import VectorSource from 'ol/source/Vector.js'
-import Feature from 'ol/Feature.js'
-import Point from 'ol/geom/Point.js'
-import { Style } from 'ol/style.js'
-
-const RADIUS_PX = 10
-
-const makeRenderer = (color) => (coords, state) => {
-  const ctx = state.context
-  const [cx, cy] = coords
-  ctx.beginPath()
-  ctx.arc(cx, cy, RADIUS_PX * state.pixelRatio, 0, Math.PI * 2)
-  ctx.fillStyle = color
-  ctx.fill()
-}
-
-const makeStyles = (colors) => ({
-  vertex: new Style({ renderer: makeRenderer(colors.snapVertex) }),
-  edge: new Style({ renderer: makeRenderer(colors.snapEdge) })
-})
-
-export const createSnapIndicator = (map, colors) => {
-  let styles = makeStyles(colors)
-  const source = new VectorSource()
-  const layer = new VectorLayer({
-    source,
-    style: (f) => styles[f.get('snapType')] ?? null,
-    zIndex: 200,
-    updateWhileAnimating: true,
-    updateWhileInteracting: true
-  })
-  map.addLayer(layer)
-
-  const feature = new Feature()
-  let showing = false
-
-  return {
-    show (coord, type) {
-      feature.setGeometry(new Point(coord))
-      feature.set('snapType', type, true)
-      if (showing) {
-        source.changed()
-      } else {
-        source.addFeature(feature)
-        showing = true
-      }
-    },
-
-    hide () {
-      if (!showing) {
-        return
-      }
-      source.clear()
-      showing = false
-    },
-
-    updateColors (newColors) {
-      styles = makeStyles(newColors)
-      if (showing) {
-        source.changed()
-      }
-    },
-
-    remove () {
-      source.clear()
-      map.removeLayer(layer)
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/snap/snapInteraction.js b/plugins/beta/draw-ol/src/snap/snapInteraction.js
deleted file mode 100644
index 67279e5b5..000000000
--- a/plugins/beta/draw-ol/src/snap/snapInteraction.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Custom OL Interaction that intercepts pointer events and rewrites
- * mapBrowserEvent.coordinate to the nearest snap candidate before any draw
- * or modify interaction sees it.
- *
- * Coordinate snapping applies to all pointer events (pointermove, pointerdown,
- * pointerup, singleclick) so that both rubberbanding and vertex placement are snapped.
- * The visual indicator is only updated on pointermove.
- *
- * Must be added to the map AFTER the Draw/Modify interaction so it is processed
- * first (OL iterates interactions in reverse-add order).
- * snapManager.reattach() handles this after each mode change.
- */
-
-import Interaction from 'ol/interaction/Interaction.js'
-
-const SNAP_EVENTS = new Set(['pointermove', 'pointerdrag', 'pointerdown', 'pointerup', 'singleclick', 'click'])
-
-const processSnapEvent = (mapBrowserEvent, engine, indicator, snapRadius, isIndicatorActive) => {
-  const { type } = mapBrowserEvent
-
-  if (type === 'pointerout' || type === 'pointerleave') {
-    indicator.hide()
-    return
-  }
-
-  if (!SNAP_EVENTS.has(type)) {
-    return
-  }
-
-  const result = engine.query(mapBrowserEvent.coordinate, snapRadius)
-  if (result) {
-    mapBrowserEvent.coordinate = result.coord.slice()
-  }
-
-  // Only update indicator during free mouse movement — hide during drag, no-op for clicks
-  if (type === 'pointermove' && isIndicatorActive()) {
-    result ? indicator.show(result.coord, result.type) : indicator.hide()
-  } else if (type === 'pointerdrag') {
-    indicator.hide()
-  } else {
-    // no indicator update for click/down/up events
-  }
-}
-
-export const createSnapInteraction = (engine, indicator, snapRadius, isIndicatorActive) => {
-  const interaction = new Interaction({
-    handleEvent (mapBrowserEvent) {
-      if (interaction.getActive()) {
-        processSnapEvent(mapBrowserEvent, engine, indicator, snapRadius, isIndicatorActive)
-      }
-      return true
-    }
-  })
-
-  return interaction
-}
diff --git a/plugins/beta/draw-ol/src/snap/snapManager.js b/plugins/beta/draw-ol/src/snap/snapManager.js
deleted file mode 100644
index 767776abe..000000000
--- a/plugins/beta/draw-ol/src/snap/snapManager.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Snap manager — orchestrates the snap engine, indicator, and OL interaction.
- *
- * Returned as manager.snap; null when no snapLayers are configured.
- *
- * Interface used by draw and edit modes:
- *   snap.apply(coord)     — query + show/hide indicator; returns snapped coord or original
- *   snap.hideIndicator()  — explicit hide (e.g. on touch/keyboard commit)
- *   snap.setActive(bool)  — enable / disable (wired to the UI snap toggle)
- *   snap.reattach()       — re-add the OL interaction after a mode change so it stays
- *                           last-added (= first to process pointermove events)
- *   snap.destroy()        — full cleanup
- */
-
-import { createSnapEngine } from './snapEngine.js'
-import { createSnapIndicator } from './snapIndicator.js'
-import { createSnapInteraction } from './snapInteraction.js'
-
-export const createSnapManager = (map, snapLayers, colors, snapRadius) => {
-  if (!snapLayers?.length) {
-    return null
-  }
-
-  const engine = createSnapEngine(map, snapLayers)
-  const indicator = createSnapIndicator(map, colors)
-
-  let indicatorActive = false
-  const interaction = createSnapInteraction(engine, indicator, snapRadius, () => indicatorActive)
-
-  map.addInteraction(interaction)
-  interaction.setActive(false) // matches reducer initial state: snap: false
-
-  let active = false
-
-  return {
-    /**
-     * Apply snap at coord. Updates the indicator and returns the snapped
-     * coordinate, or the original coordinate when no snap candidate is found.
-     * Returns original coord unchanged when snap is disabled.
-     */
-    snapRadius,
-
-    apply (coord) {
-      if (!active) {
-        return coord
-      }
-      const result = engine.query(coord, snapRadius)
-      if (result) {
-        indicator.show(result.coord, result.type)
-        return result.coord
-      }
-      indicator.hide()
-      return coord
-    },
-
-    hideIndicator () {
-      indicator.hide()
-    },
-
-    setIndicatorActive (value) {
-      indicatorActive = value
-      if (!value) {
-        indicator.hide()
-      }
-    },
-
-    setActive (value) {
-      active = value
-      interaction.setActive(value)
-      if (!value) {
-        indicator.hide()
-      }
-    },
-
-    /**
-     * Remove and re-add the OL interaction so it sits at the top of the
-     * interaction stack (last-added = first to handle pointermove).
-     * Call after each changeMode() so the interaction always runs before
-     * the newly added Draw or Modify interaction.
-     */
-    setSnapLayers (layers) {
-      engine.setLayers(layers === null || layers === undefined ? (snapLayers ?? []) : layers)
-    },
-
-    reattach () {
-      map.removeInteraction(interaction)
-      map.addInteraction(interaction)
-    },
-
-    updateColors (newColors) {
-      indicator.updateColors(newColors)
-    },
-
-    destroy () {
-      map.removeInteraction(interaction)
-      indicator.remove()
-    }
-  }
-}
diff --git a/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js b/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js
deleted file mode 100644
index cfd3df61e..000000000
--- a/plugins/beta/draw-ol/src/utils/flattenStyleProperties.js
+++ /dev/null
@@ -1,47 +0,0 @@
-const STYLE_PROPS = ['stroke', 'fill', 'strokeWidth']
-
-/**
- * Flatten style properties that may be strings or variant objects
- * keyed by style ID into flat GeoJSON-compatible properties.
- *
- * @param {object} props - Object containing style properties
- * @returns {object} Flattened properties
- *
- * @example
- * flattenStyleProperties({
- *   stroke: { outdoor: '#e6c700', dark: '#ffd700' },
- *   fill: 'rgba(255, 221, 0, 0.1)',
- *   strokeWidth: 3
- * })
- * // Returns:
- * // {
- * //   stroke: '#e6c700',
- * //   strokeOutdoor: '#e6c700',
- * //   strokeDark: '#ffd700',
- * //   fill: 'rgba(255, 221, 0, 0.1)',
- * //   strokeWidth: 3
- * // }
- */
-export const flattenStyleProperties = (props) => {
-  if (!props) {
-    return {}
-  }
-
-  const result = {}
-
-  for (const [key, value] of Object.entries(props)) {
-    if (STYLE_PROPS.includes(key) && typeof value === 'object' && value !== null) {
-      const entries = Object.entries(value)
-      if (entries.length > 0) {
-        result[key] = entries[0][1]
-      }
-      for (const [styleId, styleValue] of entries) {
-        result[`${key}${styleId.charAt(0).toUpperCase() + styleId.slice(1)}`] = styleValue
-      }
-    } else {
-      result[key] = value
-    }
-  }
-
-  return result
-}
diff --git a/plugins/beta/draw-ol/src/utils/geometryHelpers.js b/plugins/beta/draw-ol/src/utils/geometryHelpers.js
deleted file mode 100644
index 2ac3dc94a..000000000
--- a/plugins/beta/draw-ol/src/utils/geometryHelpers.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Pure geometry helpers for multi-ring/multi-part geometry support.
- * Handles coordinate transformations between flat arrays and hierarchical GeoJSON.
- * Supports Polygon, MultiPolygon, LineString, MultiLineString.
- */
-
-export const getCoords = (geom) => {
-  if (!geom?.coordinates) {
-    return []
-  }
-  switch (geom.type) {
-    case 'LineString': return geom.coordinates
-    case 'Polygon': return geom.coordinates.flatMap(ring => ring.slice(0, -1))
-    case 'MultiLineString': return geom.coordinates.flat(1)
-    case 'MultiPolygon': return geom.coordinates.flatMap(poly => poly.flatMap(ring => ring.slice(0, -1)))
-    default: return []
-  }
-}
-
-/**
- * Segment metadata for each ring or part.
- * { start, length, path, closed }
- */
-export const getRingSegments = (geom) => {
-  if (!geom?.coordinates) {
-    return []
-  }
-  const segments = []
-  let start = 0
-
-  switch (geom.type) {
-    case 'LineString':
-      segments.push({ start: 0, length: geom.coordinates.length, path: [], closed: false })
-      break
-    case 'Polygon':
-      geom.coordinates.forEach((ring, i) => {
-        const len = ring.length - 1
-        segments.push({ start, length: len, path: [i], closed: true })
-        start += len
-      })
-      break
-    case 'MultiLineString':
-      geom.coordinates.forEach((line, i) => {
-        segments.push({ start, length: line.length, path: [i], closed: false })
-        start += line.length
-      })
-      break
-    case 'MultiPolygon':
-      geom.coordinates.forEach((polygon, pi) => {
-        polygon.forEach((ring, ri) => {
-          const len = ring.length - 1
-          segments.push({ start, length: len, path: [pi, ri], closed: true })
-          start += len
-        })
-      })
-      break
-    default:
-      break
-  }
-
-  return segments
-}
-
-/** Find which segment a flat vertex index belongs to. */
-export const getSegmentForIndex = (segments, flatIdx) => {
-  for (const seg of segments) {
-    if (flatIdx >= seg.start && flatIdx < seg.start + seg.length) {
-      return { segment: seg, localIdx: flatIdx - seg.start }
-    }
-  }
-  return null
-}
-
-/** Return a reference to the coordinate array at a hierarchical path. */
-export const getModifiableCoords = (geojsonGeometry, path) => {
-  let coords = geojsonGeometry.coordinates
-  for (const idx of path) {
-    coords = coords[idx]
-  }
-  return coords
-}
-
-/** Compute midpoints for all segments, respecting open/closed ring boundaries. */
-export const getMidpoints = (geom) => {
-  const coords = getCoords(geom)
-  const segments = getRingSegments(geom)
-  if (!coords.length || !segments.length) {
-    return []
-  }
-
-  const midpoints = []
-  for (const seg of segments) {
-    const count = seg.closed ? seg.length : seg.length - 1
-    for (let i = 0; i < count; i++) {
-      const idx = seg.start + i
-      const nextIdx = seg.start + ((i + 1) % seg.length)
-      const [x1, y1] = coords[idx]
-      const [x2, y2] = coords[nextIdx]
-      midpoints.push([(x1 + x2) / 2, (y1 + y2) / 2])
-    }
-  }
-  return midpoints
-}
diff --git a/plugins/beta/draw-ol/src/utils/olCoords.js b/plugins/beta/draw-ol/src/utils/olCoords.js
deleted file mode 100644
index de730e136..000000000
--- a/plugins/beta/draw-ol/src/utils/olCoords.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Thin helpers bridging OL's array-based pixel/coordinate API
- * and the {x, y} object convention used in touch/keyboard handlers.
- */
-
-/** OL coordinate [e, n] → screen pixel { x, y } */
-export const coordToPixel = (map, coord) => {
-  const px = map.getPixelFromCoordinate(coord)
-  if (!px) { return null }
-  return { x: px[0], y: px[1] }
-}
-
-/** Screen pixel { x, y } → OL coordinate [e, n] */
-export const pixelToCoord = (map, pixel) => {
-  return map.getCoordinateFromPixel([pixel.x, pixel.y])
-}
-
-/** Pixel distance between two { x, y } points */
-export const pixelDist = (a, b) => Math.sqrt((a.x - b.x) ** 2 + (a.y - b.y) ** 2)
-
-/** OL pixel array [x, y] → { x, y } */
-export const arrayToPixel = ([x, y]) => ({ x, y })
-
-/** { x, y } → OL pixel array [x, y] */
-export const pixelToArray = ({ x, y }) => [x, y]
-
-/**
- * Nudge a coordinate by (dx, dy) screen pixels.
- * Converts pixel offset to map coordinate delta using the current resolution.
- */
-export const nudgeCoord = (map, coord, dx, dy) => {
-  const px = map.getPixelFromCoordinate(coord)
-  if (!px) { return coord }
-  return map.getCoordinateFromPixel([px[0] + dx, px[1] + dy])
-}
diff --git a/plugins/beta/draw-ol/src/utils/resolveColors.js b/plugins/beta/draw-ol/src/utils/resolveColors.js
deleted file mode 100644
index 2c3dffe50..000000000
--- a/plugins/beta/draw-ol/src/utils/resolveColors.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { DEFAULTS } from '../defaults.js'
-
-const resolveVariant = (value, scheme, styleId) => {
-  if (typeof value !== 'object' || value === null) { return value }
-  if (styleId && value[styleId] !== undefined) { return value[styleId] }
-  if (value[scheme] !== undefined) { return value[scheme] }
-  if (value.light !== undefined) { return value.light }
-  return Object.values(value)[0]
-}
-
-/**
- * Resolve all draw-ol colors for the given map style and plugin config overrides.
- *
- * Values in pluginConfig may be plain strings or variant objects (e.g. { light: '...', dark: '...' }).
- * Variant resolution order: exact style ID match → color scheme → 'light' fallback → first value.
- *
- * @param {object|null} mapStyle - Current map style object (has .id and .mapColorScheme)
- * @param {object} pluginConfig - Plugin-level user overrides (may override any DEFAULTS key)
- * @returns {object} Flat color values ready for use in createStyles()
- */
-export const resolveColors = (mapStyle, pluginConfig = {}) => {
-  const scheme = mapStyle?.mapColorScheme ?? 'light'
-  const styleId = mapStyle?.id ?? null
-  const r = (key) => resolveVariant(pluginConfig[key] ?? DEFAULTS[key], scheme, styleId)
-
-  return {
-    editStroke: r('editStroke'),
-    editVertex: r('editVertex'),
-    editMidpoint: r('editMidpoint'),
-    editActive: r('editActive'),
-    editHalo: r('editHalo'),
-    shapeStroke: r('shapeStroke'),
-    strokeWidth: pluginConfig.strokeWidth ?? DEFAULTS.strokeWidth,
-    shapeFill: r('shapeFill'),
-    snapVertex: r('snapVertex'),
-    snapEdge: r('snapEdge'),
-    mapStyleId: styleId
-  }
-}
diff --git a/plugins/beta/draw-ol/src/utils/spatial.js b/plugins/beta/draw-ol/src/utils/spatial.js
deleted file mode 100644
index b9238b6a0..000000000
--- a/plugins/beta/draw-ol/src/utils/spatial.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Navigate spatially from a start pixel toward a direction quadrant.
- * Returns the index of the nearest pixel in that direction.
- *
- * @param {[number, number]} start - Current pixel [x, y]
- * @param {Array<[number, number]>} pixels - All candidate pixels
- * @param {string} direction - ArrowUp | ArrowDown | ArrowLeft | ArrowRight | undefined (nearest)
- * @returns {number} Index into pixels array
- */
-export const spatialNavigate = (start, pixels, direction) => {
-  const quadrant = pixels.filter((p) => {
-    const dx = Math.abs(p[0] - start[0])
-    const dy = Math.abs(p[1] - start[1])
-    let inQuadrant = false
-    if (direction === 'ArrowUp') { inQuadrant = p[1] <= start[1] && dy >= dx } else if (direction === 'ArrowDown') { inQuadrant = p[1] > start[1] && dy >= dx } else if (direction === 'ArrowLeft') { inQuadrant = p[0] <= start[0] && dy < dx } else if (direction === 'ArrowRight') { inQuadrant = p[0] > start[0] && dy < dx } else { inQuadrant = true }
-    return inQuadrant && JSON.stringify(p) !== JSON.stringify(start)
-  })
-
-  if (!quadrant.length) { quadrant.push(start) }
-
-  const dist = (p) => Math.hypot(start[0] - p[0], start[1] - p[1])
-  const closest = quadrant.reduce((best, p) => dist(p) < dist(best) ? p : best, quadrant[0])
-  return pixels.findIndex(p => JSON.stringify(p) === JSON.stringify(closest))
-}
diff --git a/plugins/beta/draw-ol/src/utils/touchTarget.js b/plugins/beta/draw-ol/src/utils/touchTarget.js
deleted file mode 100644
index 663ff499d..000000000
--- a/plugins/beta/draw-ol/src/utils/touchTarget.js
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * SVG offset vertex target — shown below the finger in touch edit mode
- * so the user can accurately reposition a vertex without finger occlusion.
- * This module handles DOM management only; drag logic lives in touchHandler.js.
- *
- * The SVG uses CSS custom properties so colors update when the map style changes:
- *   --draw-halo      outer ring (black on light, white on dark)
- *   --draw-bg        inner background (white on light, near-black on dark)
- *   --draw-primary   arrow icons and centre dot (blue on light, white on dark)
- */
-
-const SVG_HTML = `
-  <svg width='48' height='48' viewBox='0 0 48 48' fill-rule='evenodd'
-    style='display:none;position:absolute;top:0;left:0;margin:24px 0 0 -24px;cursor:grab'
-    class='im-draw-touch-target' data-im-draw-touch-target>
-    <circle cx='24' cy='24' r='24' fill='var(--draw-halo, #000)'/>
-    <path d="M37.543 25H34a1 1 0 1 1 0-2h3.629l-.836-.837a1 1 0 0 1 1.414-1.414l2.5 2.501A1 1 0 0 1 41 24a1 1 0 0 1-.487.858l-2.306 2.306a1 1 0 0 1-1.414-1.414l.75-.75zM23 10.414l-.793.793a1 1 0 0 1-1.414-1.414l2.5-2.5C23.481 7.105 23.734 7 24 7s.519.105.707.293l2.5 2.5a1 1 0 0 1-1.414 1.414L25 10.414V14a1 1 0 1 1-2 0v-3.586zM7 24a1 1 0 0 1 .293-.75l2.5-2.501a1 1 0 0 1 1.414 1.414l-.836.837H14a1 1 0 1 1 0 2h-3.543l.75.75a1 1 0 0 1-1.414 1.414l-2.306-2.306A1 1 0 0 1 7 24zm16.293 16.707l-2.5-2.5a1 1 0 0 1 1.414-1.414l.793.793V34a1 1 0 1 1 2 0v3.586l.793-.793a1 1 0 0 1 1.414 1.414l-2.5 2.5c-.188.188-.441.293-.707.293s-.519-.105-.707-.293zM24 20c2.208 0 4 1.792 4 4s-1.792 4-4 4-4-1.792-4-4 1.792-4 4-4z" fill='var(--draw-bg, #fff)'/>
-  </svg>
-`
-
-export const createTouchTarget = (container) => {
-  let el = container.querySelector('[data-im-draw-touch-target]')
-  if (!el) {
-    container.insertAdjacentHTML('beforeend', SVG_HTML)
-    el = container.querySelector('[data-im-draw-touch-target]')
-  }
-  return el
-}
-
-export const applyTouchTargetColors = (el, colors) => {
-  if (!el) {
-    return
-  }
-  el.style.setProperty('--draw-halo', colors.editActive)
-  el.style.setProperty('--draw-bg', colors.editHalo)
-  el.style.setProperty('--draw-primary', colors.editVertex)
-}
-
-export const showTouchTarget = (el, pixel) => {
-  if (!pixel || !el) {
-    return
-  }
-  el.style.left = `${pixel.x}px`
-  el.style.top = `${pixel.y}px`
-  el.style.display = 'block'
-}
-
-export const hideTouchTarget = (el) => {
-  if (el) {
-    el.style.display = 'none'
-  }
-}
-
-/** True when the event target is part of the SVG touch target element. */
-export const isOnTouchTarget = (el) => {
-  if (!el) {
-    return false
-  }
-  const parent = el.parentNode
-  return (parent instanceof globalThis.SVGElement) || (parent?.ownerSVGElement != null)
-}
diff --git a/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js b/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js
index 00e7bc87a..acde92662 100644
--- a/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js
+++ b/plugins/datasets/src/adapters/openlayers/canvasPatternStyle.test.js
@@ -2,8 +2,8 @@ import Style from 'ol/style/Style.js'
 import Feature from 'ol/Feature.js'
 import Point from 'ol/geom/Point.js'
 import { buildCanvasPatternStyle } from './canvasPatternStyle.js'
-import { buildFilterEvaluator } from '../../../../../providers/beta/openlayers/src/utils/filterEvaluator.js'
-import { PatternImageCache } from '../../../../../providers/beta/openlayers/src/utils/patternImages.js'
+import { buildFilterEvaluator } from '../../../../../providers/openlayers/src/utils/filterEvaluator.js'
+import { PatternImageCache } from '../../../../../providers/openlayers/src/utils/patternImages.js'
 
 const OUTDOOR = 'outdoor'
 
diff --git a/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js b/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js
index fc1553b30..74bcde858 100644
--- a/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js
+++ b/plugins/datasets/src/adapters/openlayers/layerBuilders.test.js
@@ -5,7 +5,7 @@ import VectorTileLayer from 'ol/layer/VectorTile.js'
 import { createDatasetSource, createDatasetLayer, readGeoJSONFeatures } from './layerBuilders.js'
 import { logger } from '../../../../../src/services/logger.js'
 // The OL provider registers British National Grid when it loads
-import '../../../../../providers/beta/openlayers/src/utils/bngProjection.js'
+import '../../../../../providers/openlayers/src/utils/bngProjection.js'
 
 jest.mock('../../../../../src/services/logger.js', () => ({ logger: { warn: jest.fn() } }))
 
diff --git a/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js b/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js
index 82c25a125..55dd48af3 100644
--- a/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js
+++ b/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.js
@@ -66,7 +66,7 @@ export default class OpenLayersLayerAdapter extends MapboxStyleLayerAdapter {
     this._sourcesById.clear()
   }
 
-  // OL's basemap swap (see providers/beta/openlayers's appEvents.js) only replaces the base
+  // OL's basemap swap (see providers/openlayers's appEvents.js) only replaces the base
   // tile layer — dataset layers are separate map.addLayer() entries and are never wiped, so
   // unlike MapLibre there's nothing to rebuild here, just colour tokens to re-resolve. Pattern
   // fg/bg colours can be mapStyle-keyed too, so re-registering (not just re-styling) is needed.
diff --git a/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js b/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js
index 34f39137e..fe1ea6aba 100644
--- a/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js
+++ b/plugins/datasets/src/adapters/openlayers/openlayersLayerAdapter.test.js
@@ -3,11 +3,11 @@ import { datasetRegistry } from '../../registry/datasetRegistry.js'
 import { createPatternRegistry } from '../../../../../src/services/patternRegistry.js'
 import { createSymbolRegistry } from '../../../../../src/services/symbolRegistry.js'
 import { logger } from '../../../../../src/services/logger.js'
-import { SymbolImageCache } from '../../../../../providers/beta/openlayers/src/utils/symbolImages.js'
-import { PatternImageCache } from '../../../../../providers/beta/openlayers/src/utils/patternImages.js'
-import { buildFilterEvaluator } from '../../../../../providers/beta/openlayers/src/utils/filterEvaluator.js'
+import { SymbolImageCache } from '../../../../../providers/openlayers/src/utils/symbolImages.js'
+import { PatternImageCache } from '../../../../../providers/openlayers/src/utils/patternImages.js'
+import { buildFilterEvaluator } from '../../../../../providers/openlayers/src/utils/filterEvaluator.js'
 // The OL provider registers British National Grid when it loads
-import '../../../../../providers/beta/openlayers/src/utils/bngProjection.js'
+import '../../../../../providers/openlayers/src/utils/bngProjection.js'
 import VectorLayer from 'ol/layer/Vector.js'
 import VectorTileLayer from 'ol/layer/VectorTile.js'
 import * as layerBuilders from './layerBuilders.js'
diff --git a/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js b/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js
index 77071ad3a..46192c150 100644
--- a/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js
+++ b/plugins/datasets/src/adapters/openlayers/registry/openLayersDataset.test.js
@@ -1,7 +1,7 @@
 import { OpenLayersDataset } from './openLayersDataset.js'
 import { datasetRegistry } from '../../../registry/datasetRegistry.js'
 import { createSymbolRegistry } from '../../../../../../src/services/symbolRegistry.js'
-import { SymbolImageCache } from '../../../../../../providers/beta/openlayers/src/utils/symbolImages.js'
+import { SymbolImageCache } from '../../../../../../providers/openlayers/src/utils/symbolImages.js'
 
 const symbolRegistry = createSymbolRegistry()
 // Use the mock datasetRegistry with the demo datasets attached before each test
diff --git a/plugins/datasets/src/initialise/DatasetsInit.jsx b/plugins/datasets/src/initialise/DatasetsInit.jsx
index 50771e75f..ae9bb8836 100755
--- a/plugins/datasets/src/initialise/DatasetsInit.jsx
+++ b/plugins/datasets/src/initialise/DatasetsInit.jsx
@@ -82,7 +82,7 @@ export function DatasetsInit ({ appConfig, appState, pluginConfig, pluginState,
       // symbols/patterns below) naturally re-trigger MAP_DATA_CHANGE via the GL engine's own
       // styledata event — nothing extra needed there. OL has no such generic signal (its
       // MAP_DATA_CHANGE is tied only to the basemap tile source's own tileloadend — see
-      // providers/beta/openlayers/src/appEvents.js's comment), so re-registering a symbol on a
+      // providers/openlayers/src/appEvents.js's comment), so re-registering a symbol on a
       // plain ol/layer/Vector never fires it. Emitting it explicitly once re-registration
       // genuinely finishes lets the interact plugin's settle-window re-apply (armed by
       // MAP_STYLE_CHANGE, see useHighlightSync.js) pick up the new theme's selected/active
diff --git a/plugins/beta/draw-es/src/DrawInit.jsx b/plugins/draw-es/src/DrawInit.jsx
similarity index 96%
rename from plugins/beta/draw-es/src/DrawInit.jsx
rename to plugins/draw-es/src/DrawInit.jsx
index ee1b46979..5bae21fe8 100755
--- a/plugins/beta/draw-es/src/DrawInit.jsx
+++ b/plugins/draw-es/src/DrawInit.jsx
@@ -1,5 +1,5 @@
 import { useEffect } from 'react'
-import { EVENTS } from '../../../../src/config/events.js'
+import { EVENTS } from '../../../src/config/events.js'
 import { createSketchViewModel } from './sketchViewModel.js'
 import { attachEvents } from './events.js'
 
diff --git a/plugins/beta/draw-es/src/api/addFeature.js b/plugins/draw-es/src/api/addFeature.js
similarity index 100%
rename from plugins/beta/draw-es/src/api/addFeature.js
rename to plugins/draw-es/src/api/addFeature.js
diff --git a/plugins/beta/draw-es/src/api/deleteFeature.js b/plugins/draw-es/src/api/deleteFeature.js
similarity index 100%
rename from plugins/beta/draw-es/src/api/deleteFeature.js
rename to plugins/draw-es/src/api/deleteFeature.js
diff --git a/plugins/beta/draw-es/src/api/editFeature.js b/plugins/draw-es/src/api/editFeature.js
similarity index 100%
rename from plugins/beta/draw-es/src/api/editFeature.js
rename to plugins/draw-es/src/api/editFeature.js
diff --git a/plugins/beta/draw-es/src/api/newPolygon.js b/plugins/draw-es/src/api/newPolygon.js
similarity index 100%
rename from plugins/beta/draw-es/src/api/newPolygon.js
rename to plugins/draw-es/src/api/newPolygon.js
diff --git a/plugins/beta/draw-es/src/api/removeSafeZone.js b/plugins/draw-es/src/api/removeSafeZone.js
similarity index 100%
rename from plugins/beta/draw-es/src/api/removeSafeZone.js
rename to plugins/draw-es/src/api/removeSafeZone.js
diff --git a/plugins/beta/draw-es/src/events.js b/plugins/draw-es/src/events.js
similarity index 100%
rename from plugins/beta/draw-es/src/events.js
rename to plugins/draw-es/src/events.js
diff --git a/plugins/beta/draw-es/src/events.test.js b/plugins/draw-es/src/events.test.js
similarity index 99%
rename from plugins/beta/draw-es/src/events.test.js
rename to plugins/draw-es/src/events.test.js
index 13ea0ba1a..dd7108744 100644
--- a/plugins/beta/draw-es/src/events.test.js
+++ b/plugins/draw-es/src/events.test.js
@@ -1,5 +1,5 @@
 import { attachEvents } from './events.js'
-import { EVENTS as events } from '../../../../src/config/events.js'
+import { EVENTS as events } from '../../../src/config/events.js'
 
 import * as graphicJs from './graphic.js'
 jest.mock('./graphic.js')
diff --git a/plugins/beta/draw-es/src/graphic.js b/plugins/draw-es/src/graphic.js
similarity index 97%
rename from plugins/beta/draw-es/src/graphic.js
rename to plugins/draw-es/src/graphic.js
index 9ed1802d3..5e48eb801 100644
--- a/plugins/beta/draw-es/src/graphic.js
+++ b/plugins/draw-es/src/graphic.js
@@ -1,6 +1,6 @@
 import Graphic from '@arcgis/core/Graphic.js'
 import * as simplifyOperator from '@arcgis/core/geometry/operators/simplifyOperator.js'
-import { logger } from '../../../../src/services/logger.js'
+import { logger } from '../../../src/services/logger.js'
 
 function createSymbol (mapColorScheme) {
   return {
diff --git a/plugins/beta/draw-es/src/index.js b/plugins/draw-es/src/index.js
similarity index 100%
rename from plugins/beta/draw-es/src/index.js
rename to plugins/draw-es/src/index.js
diff --git a/plugins/beta/draw-es/src/manifest.js b/plugins/draw-es/src/manifest.js
similarity index 100%
rename from plugins/beta/draw-es/src/manifest.js
rename to plugins/draw-es/src/manifest.js
diff --git a/plugins/beta/draw-es/src/reducer.js b/plugins/draw-es/src/reducer.js
similarity index 100%
rename from plugins/beta/draw-es/src/reducer.js
rename to plugins/draw-es/src/reducer.js
diff --git a/plugins/beta/draw-es/src/sketchViewModel.js b/plugins/draw-es/src/sketchViewModel.js
similarity index 100%
rename from plugins/beta/draw-es/src/sketchViewModel.js
rename to plugins/draw-es/src/sketchViewModel.js
diff --git a/plugins/draw/src/adapters/openlayers/core/styles.test.js b/plugins/draw/src/adapters/openlayers/core/styles.test.js
index 64ac7c954..a8d143267 100644
--- a/plugins/draw/src/adapters/openlayers/core/styles.test.js
+++ b/plugins/draw/src/adapters/openlayers/core/styles.test.js
@@ -5,7 +5,7 @@ import Icon from 'ol/style/Icon.js'
 import { createStyles } from './styles.js'
 import { SIZES } from '../defaults.js'
 import { polygonFeature, lineFeature, pointFeature } from '../__helpers__/harness.js'
-import { SymbolImageCache } from '../../../../../../providers/beta/openlayers/src/utils/symbolImages.js'
+import { SymbolImageCache } from '../../../../../../providers/openlayers/src/utils/symbolImages.js'
 
 const colors = {
   editStroke: '#e5',
diff --git a/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js b/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js
index ea5f74a22..5c42729e4 100644
--- a/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js
+++ b/plugins/draw/src/adapters/openlayers/point/pointSymbolImages.test.js
@@ -1,6 +1,6 @@
 import { getPixelRatio, resolvePointSymbol, refreshAllPointSymbols } from './pointSymbolImages.js'
 import { createSymbolRegistry } from '../../../../../../src/services/symbolRegistry.js'
-import { SymbolImageCache } from '../../../../../../providers/beta/openlayers/src/utils/symbolImages.js'
+import { SymbolImageCache } from '../../../../../../providers/openlayers/src/utils/symbolImages.js'
 
 const symbolRegistry = createSymbolRegistry()
 
diff --git a/plugins/beta/frame/package.json b/plugins/frame/package.json
similarity index 79%
rename from plugins/beta/frame/package.json
rename to plugins/frame/package.json
index 3ef0c7785..be8faf514 100644
--- a/plugins/beta/frame/package.json
+++ b/plugins/frame/package.json
@@ -18,8 +18,8 @@
     "react-dom": { "optional": true }
   },
   "scripts": {
-    "build:umd": "webpack --config ../../../webpack.umd.js --mode production",
-    "build:esm": "webpack --config ../../../webpack.esm.mjs --mode production",
+    "build:umd": "webpack --config ../../webpack.umd.js --mode production",
+    "build:esm": "webpack --config ../../webpack.esm.mjs --mode production",
     "build": "npm run build:umd && npm run build:esm",
     "clean": "rm -rf dist"
   },
diff --git a/plugins/beta/frame/src/Frame.jsx b/plugins/frame/src/Frame.jsx
similarity index 100%
rename from plugins/beta/frame/src/Frame.jsx
rename to plugins/frame/src/Frame.jsx
diff --git a/plugins/beta/frame/src/FrameInit.jsx b/plugins/frame/src/FrameInit.jsx
similarity index 100%
rename from plugins/beta/frame/src/FrameInit.jsx
rename to plugins/frame/src/FrameInit.jsx
diff --git a/plugins/beta/frame/src/api/addFrame.js b/plugins/frame/src/api/addFrame.js
similarity index 100%
rename from plugins/beta/frame/src/api/addFrame.js
rename to plugins/frame/src/api/addFrame.js
diff --git a/plugins/beta/frame/src/api/editFeature.js b/plugins/frame/src/api/editFeature.js
similarity index 100%
rename from plugins/beta/frame/src/api/editFeature.js
rename to plugins/frame/src/api/editFeature.js
diff --git a/plugins/beta/frame/src/config.js b/plugins/frame/src/config.js
similarity index 100%
rename from plugins/beta/frame/src/config.js
rename to plugins/frame/src/config.js
diff --git a/plugins/beta/frame/src/frame.scss b/plugins/frame/src/frame.scss
similarity index 100%
rename from plugins/beta/frame/src/frame.scss
rename to plugins/frame/src/frame.scss
diff --git a/plugins/beta/frame/src/index.js b/plugins/frame/src/index.js
similarity index 100%
rename from plugins/beta/frame/src/index.js
rename to plugins/frame/src/index.js
diff --git a/plugins/beta/frame/src/manifest.js b/plugins/frame/src/manifest.js
similarity index 100%
rename from plugins/beta/frame/src/manifest.js
rename to plugins/frame/src/manifest.js
diff --git a/plugins/beta/frame/src/reducer.js b/plugins/frame/src/reducer.js
similarity index 100%
rename from plugins/beta/frame/src/reducer.js
rename to plugins/frame/src/reducer.js
diff --git a/plugins/beta/frame/src/utils.js b/plugins/frame/src/utils.js
similarity index 100%
rename from plugins/beta/frame/src/utils.js
rename to plugins/frame/src/utils.js
diff --git a/plugins/beta/map-styles/src/MapStyles.jsx b/plugins/map-styles/src/MapStyles.jsx
similarity index 95%
rename from plugins/beta/map-styles/src/MapStyles.jsx
rename to plugins/map-styles/src/MapStyles.jsx
index d78e2b73d..98acede2f 100755
--- a/plugins/beta/map-styles/src/MapStyles.jsx
+++ b/plugins/map-styles/src/MapStyles.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
-import { EVENTS } from '../../../../src/config/events.js'
+import { EVENTS } from '../../../src/config/events.js'
 import { textSizeSvgPath } from './config.js'
-import { scaleFactor } from '../../../../src/config/appConfig.js'
+import { scaleFactor } from '../../../src/config/appConfig.js'
 
 export const MapStyles = ({ mapState, pluginConfig, services, mapProvider }) => {
   const { mapStyle: currentMapStyle, mapSize: currentMapSize } = mapState
diff --git a/plugins/beta/map-styles/src/MapStylesInit.jsx b/plugins/map-styles/src/MapStylesInit.jsx
similarity index 88%
rename from plugins/beta/map-styles/src/MapStylesInit.jsx
rename to plugins/map-styles/src/MapStylesInit.jsx
index eff44cc55..035a19ead 100755
--- a/plugins/beta/map-styles/src/MapStylesInit.jsx
+++ b/plugins/map-styles/src/MapStylesInit.jsx
@@ -1,6 +1,6 @@
 // src/plugins/mapStyles/MapStylesInit.jsx
 import { useEffect } from 'react'
-import { EVENTS } from '../../../../src/config/events.js'
+import { EVENTS } from '../../../src/config/events.js'
 
 export function MapStylesInit ({ pluginConfig, services }) {
   const { eventBus } = services
diff --git a/plugins/beta/map-styles/src/config.js b/plugins/map-styles/src/config.js
similarity index 100%
rename from plugins/beta/map-styles/src/config.js
rename to plugins/map-styles/src/config.js
diff --git a/plugins/beta/map-styles/src/index.js b/plugins/map-styles/src/index.js
similarity index 100%
rename from plugins/beta/map-styles/src/index.js
rename to plugins/map-styles/src/index.js
diff --git a/plugins/beta/map-styles/src/manifest.js b/plugins/map-styles/src/manifest.js
similarity index 100%
rename from plugins/beta/map-styles/src/manifest.js
rename to plugins/map-styles/src/manifest.js
diff --git a/plugins/beta/map-styles/src/mapStyles.scss b/plugins/map-styles/src/mapStyles.scss
similarity index 100%
rename from plugins/beta/map-styles/src/mapStyles.scss
rename to plugins/map-styles/src/mapStyles.scss
diff --git a/plugins/beta/scale-bar/package.json b/plugins/scale-bar/package.json
similarity index 79%
rename from plugins/beta/scale-bar/package.json
rename to plugins/scale-bar/package.json
index f054c8c54..f4992fa6a 100644
--- a/plugins/beta/scale-bar/package.json
+++ b/plugins/scale-bar/package.json
@@ -18,8 +18,8 @@
     "react-dom": { "optional": true }
   },
   "scripts": {
-    "build:umd": "webpack --config ../../../webpack.umd.js --mode production",
-    "build:esm": "webpack --config ../../../webpack.esm.mjs --mode production",
+    "build:umd": "webpack --config ../../webpack.umd.js --mode production",
+    "build:esm": "webpack --config ../../webpack.esm.mjs --mode production",
     "build": "npm run build:umd && npm run build:esm",
     "clean": "rm -rf dist"
   },
diff --git a/plugins/beta/scale-bar/src/ScaleBar.jsx b/plugins/scale-bar/src/ScaleBar.jsx
similarity index 100%
rename from plugins/beta/scale-bar/src/ScaleBar.jsx
rename to plugins/scale-bar/src/ScaleBar.jsx
diff --git a/plugins/beta/scale-bar/src/ScaleBar.test.jsx b/plugins/scale-bar/src/ScaleBar.test.jsx
similarity index 100%
rename from plugins/beta/scale-bar/src/ScaleBar.test.jsx
rename to plugins/scale-bar/src/ScaleBar.test.jsx
diff --git a/plugins/beta/scale-bar/src/index.js b/plugins/scale-bar/src/index.js
similarity index 100%
rename from plugins/beta/scale-bar/src/index.js
rename to plugins/scale-bar/src/index.js
diff --git a/plugins/beta/scale-bar/src/index.test.js b/plugins/scale-bar/src/index.test.js
similarity index 100%
rename from plugins/beta/scale-bar/src/index.test.js
rename to plugins/scale-bar/src/index.test.js
diff --git a/plugins/beta/scale-bar/src/manifest.js b/plugins/scale-bar/src/manifest.js
similarity index 100%
rename from plugins/beta/scale-bar/src/manifest.js
rename to plugins/scale-bar/src/manifest.js
diff --git a/plugins/beta/scale-bar/src/scaleBar.scss b/plugins/scale-bar/src/scaleBar.scss
similarity index 100%
rename from plugins/beta/scale-bar/src/scaleBar.scss
rename to plugins/scale-bar/src/scaleBar.scss
diff --git a/plugins/beta/scale-bar/src/utils.js b/plugins/scale-bar/src/utils.js
similarity index 100%
rename from plugins/beta/scale-bar/src/utils.js
rename to plugins/scale-bar/src/utils.js
diff --git a/plugins/beta/scale-bar/src/utils.test.js b/plugins/scale-bar/src/utils.test.js
similarity index 100%
rename from plugins/beta/scale-bar/src/utils.test.js
rename to plugins/scale-bar/src/utils.test.js
diff --git a/plugins/beta/use-location/src/UseLocation.jsx b/plugins/use-location/src/UseLocation.jsx
similarity index 100%
rename from plugins/beta/use-location/src/UseLocation.jsx
rename to plugins/use-location/src/UseLocation.jsx
diff --git a/plugins/beta/use-location/src/UseLocationInit.jsx b/plugins/use-location/src/UseLocationInit.jsx
similarity index 100%
rename from plugins/beta/use-location/src/UseLocationInit.jsx
rename to plugins/use-location/src/UseLocationInit.jsx
diff --git a/plugins/beta/use-location/src/defaults.js b/plugins/use-location/src/defaults.js
similarity index 100%
rename from plugins/beta/use-location/src/defaults.js
rename to plugins/use-location/src/defaults.js
diff --git a/plugins/beta/use-location/src/events.js b/plugins/use-location/src/events.js
similarity index 100%
rename from plugins/beta/use-location/src/events.js
rename to plugins/use-location/src/events.js
diff --git a/plugins/beta/use-location/src/index.js b/plugins/use-location/src/index.js
similarity index 100%
rename from plugins/beta/use-location/src/index.js
rename to plugins/use-location/src/index.js
diff --git a/plugins/beta/use-location/src/manifest.js b/plugins/use-location/src/manifest.js
similarity index 100%
rename from plugins/beta/use-location/src/manifest.js
rename to plugins/use-location/src/manifest.js
diff --git a/plugins/beta/use-location/src/reducer.js b/plugins/use-location/src/reducer.js
similarity index 100%
rename from plugins/beta/use-location/src/reducer.js
rename to plugins/use-location/src/reducer.js
diff --git a/providers/beta/esri/src/appEvents.js b/providers/esri/src/appEvents.js
similarity index 100%
rename from providers/beta/esri/src/appEvents.js
rename to providers/esri/src/appEvents.js
diff --git a/providers/beta/esri/src/defaults.js b/providers/esri/src/defaults.js
similarity index 100%
rename from providers/beta/esri/src/defaults.js
rename to providers/esri/src/defaults.js
diff --git a/providers/beta/esri/src/esriProvider.js b/providers/esri/src/esriProvider.js
similarity index 99%
rename from providers/beta/esri/src/esriProvider.js
rename to providers/esri/src/esriProvider.js
index 047bf47eb..e2bfe5b6e 100644
--- a/providers/beta/esri/src/esriProvider.js
+++ b/providers/esri/src/esriProvider.js
@@ -1,5 +1,5 @@
 // src/plugins/mapStyles/EsriProvider.jsx
-import { MapProvider } from '../../../mapProvider.js'
+import { MapProvider } from '../../mapProvider.js'
 import './esriProvider.scss'
 import esriConfig from '@arcgis/core/config.js'
 import TileInfo from '@arcgis/core/layers/support/TileInfo.js'
diff --git a/providers/beta/esri/src/esriProvider.scss b/providers/esri/src/esriProvider.scss
similarity index 100%
rename from providers/beta/esri/src/esriProvider.scss
rename to providers/esri/src/esriProvider.scss
diff --git a/providers/beta/esri/src/index.js b/providers/esri/src/index.js
similarity index 100%
rename from providers/beta/esri/src/index.js
rename to providers/esri/src/index.js
diff --git a/providers/beta/esri/src/mapEvents.js b/providers/esri/src/mapEvents.js
similarity index 96%
rename from providers/beta/esri/src/mapEvents.js
rename to providers/esri/src/mapEvents.js
index ea0288443..ab1d71ce1 100644
--- a/providers/beta/esri/src/mapEvents.js
+++ b/providers/esri/src/mapEvents.js
@@ -1,6 +1,6 @@
 import { watch, when, once } from '@arcgis/core/core/reactiveUtils.js'
-import { debounce } from '../../../../src/utils/debounce.js'
-import { throttle } from '../../../../src/utils/throttle.js'
+import { debounce } from '../../../src/utils/debounce.js'
+import { throttle } from '../../../src/utils/throttle.js'
 
 const DEBOUNCE_IDLE_TIME = 500
 const MOVE_THROTTLE_TIME = 10
diff --git a/providers/beta/esri/src/utils/coords.js b/providers/esri/src/utils/coords.js
similarity index 100%
rename from providers/beta/esri/src/utils/coords.js
rename to providers/esri/src/utils/coords.js
diff --git a/providers/beta/esri/src/utils/coords.test.js b/providers/esri/src/utils/coords.test.js
similarity index 100%
rename from providers/beta/esri/src/utils/coords.test.js
rename to providers/esri/src/utils/coords.test.js
diff --git a/providers/beta/esri/src/utils/detectWebGL.js b/providers/esri/src/utils/detectWebGL.js
similarity index 100%
rename from providers/beta/esri/src/utils/detectWebGL.js
rename to providers/esri/src/utils/detectWebGL.js
diff --git a/providers/beta/esri/src/utils/esriFixes.js b/providers/esri/src/utils/esriFixes.js
similarity index 100%
rename from providers/beta/esri/src/utils/esriFixes.js
rename to providers/esri/src/utils/esriFixes.js
diff --git a/providers/beta/esri/src/utils/query.js b/providers/esri/src/utils/query.js
similarity index 100%
rename from providers/beta/esri/src/utils/query.js
rename to providers/esri/src/utils/query.js
diff --git a/providers/beta/esri/src/utils/spatial.js b/providers/esri/src/utils/spatial.js
similarity index 100%
rename from providers/beta/esri/src/utils/spatial.js
rename to providers/esri/src/utils/spatial.js
diff --git a/providers/beta/esri/src/utils/spatial.test.js b/providers/esri/src/utils/spatial.test.js
similarity index 100%
rename from providers/beta/esri/src/utils/spatial.test.js
rename to providers/esri/src/utils/spatial.test.js
diff --git a/providers/beta/open-names/src/index.js b/providers/open-names/src/index.js
similarity index 100%
rename from providers/beta/open-names/src/index.js
rename to providers/open-names/src/index.js
diff --git a/providers/beta/open-names/src/reverseGeocode.js b/providers/open-names/src/reverseGeocode.js
similarity index 100%
rename from providers/beta/open-names/src/reverseGeocode.js
rename to providers/open-names/src/reverseGeocode.js
diff --git a/providers/beta/open-names/src/utils/mapToLocationModel.js b/providers/open-names/src/utils/mapToLocationModel.js
similarity index 100%
rename from providers/beta/open-names/src/utils/mapToLocationModel.js
rename to providers/open-names/src/utils/mapToLocationModel.js
diff --git a/providers/beta/open-names/src/utils/mapToLocationModel.test.js b/providers/open-names/src/utils/mapToLocationModel.test.js
similarity index 100%
rename from providers/beta/open-names/src/utils/mapToLocationModel.test.js
rename to providers/open-names/src/utils/mapToLocationModel.test.js
diff --git a/providers/beta/openlayers/src/appEvents.js b/providers/openlayers/src/appEvents.js
similarity index 100%
rename from providers/beta/openlayers/src/appEvents.js
rename to providers/openlayers/src/appEvents.js
diff --git a/providers/beta/openlayers/src/appEvents.test.js b/providers/openlayers/src/appEvents.test.js
similarity index 100%
rename from providers/beta/openlayers/src/appEvents.test.js
rename to providers/openlayers/src/appEvents.test.js
diff --git a/providers/beta/openlayers/src/defaults.js b/providers/openlayers/src/defaults.js
similarity index 100%
rename from providers/beta/openlayers/src/defaults.js
rename to providers/openlayers/src/defaults.js
diff --git a/providers/beta/openlayers/src/index.js b/providers/openlayers/src/index.js
similarity index 81%
rename from providers/beta/openlayers/src/index.js
rename to providers/openlayers/src/index.js
index 9de7a2bed..e5dac2039 100644
--- a/providers/beta/openlayers/src/index.js
+++ b/providers/openlayers/src/index.js
@@ -1,8 +1,8 @@
 /**
- * @typedef {import('../../../../src/types.js').MapProviderDescriptor} MapProviderDescriptor
- * @typedef {import('../../../../src/types.js').MapProviderLoadResult} MapProviderLoadResult
- * @typedef {import('../../../../src/types.js').MapProviderConfig} MapProviderConfig
- * @typedef {import('../../../../src/types.js').OpenLayersProviderConfig} OpenLayersProviderConfig
+ * @typedef {import('../../../src/types.js').MapProviderDescriptor} MapProviderDescriptor
+ * @typedef {import('../../../src/types.js').MapProviderLoadResult} MapProviderLoadResult
+ * @typedef {import('../../../src/types.js').MapProviderConfig} MapProviderConfig
+ * @typedef {import('../../../src/types.js').OpenLayersProviderConfig} OpenLayersProviderConfig
  */
 
 /**
diff --git a/providers/beta/openlayers/src/index.test.js b/providers/openlayers/src/index.test.js
similarity index 100%
rename from providers/beta/openlayers/src/index.test.js
rename to providers/openlayers/src/index.test.js
diff --git a/providers/beta/openlayers/src/mapEvents.js b/providers/openlayers/src/mapEvents.js
similarity index 96%
rename from providers/beta/openlayers/src/mapEvents.js
rename to providers/openlayers/src/mapEvents.js
index 59795d814..0d73a9e3d 100644
--- a/providers/beta/openlayers/src/mapEvents.js
+++ b/providers/openlayers/src/mapEvents.js
@@ -1,5 +1,5 @@
-import { debounce } from '../../../../src/utils/debounce.js'
-import { throttle } from '../../../../src/utils/throttle.js'
+import { debounce } from '../../../src/utils/debounce.js'
+import { throttle } from '../../../src/utils/throttle.js'
 import { ZOOM_TOLERANCE } from './defaults.js'
 
 const DEBOUNCE_IDLE_TIME = 500
diff --git a/providers/beta/openlayers/src/mapEvents.test.js b/providers/openlayers/src/mapEvents.test.js
similarity index 98%
rename from providers/beta/openlayers/src/mapEvents.test.js
rename to providers/openlayers/src/mapEvents.test.js
index e4d5fda6c..83e4f7320 100644
--- a/providers/beta/openlayers/src/mapEvents.test.js
+++ b/providers/openlayers/src/mapEvents.test.js
@@ -3,7 +3,7 @@ import { attachMapEvents } from './mapEvents.js'
 
 const mockDebounceFns = []
 
-jest.mock('../../../../src/utils/debounce.js', () => ({
+jest.mock('../../../src/utils/debounce.js', () => ({
   __esModule: true,
   debounce: (fn) => {
     const wrapper = jest.fn()
@@ -14,7 +14,7 @@ jest.mock('../../../../src/utils/debounce.js', () => ({
 }))
 
 // Passthrough throttle: calls fn immediately (no cancel needed, not added to debouncers)
-jest.mock('../../../../src/utils/throttle.js', () => ({
+jest.mock('../../../src/utils/throttle.js', () => ({
   __esModule: true,
   throttle: (fn) => jest.fn(fn)
 }))
diff --git a/providers/beta/openlayers/src/openlayersProvider.js b/providers/openlayers/src/openlayersProvider.js
similarity index 98%
rename from providers/beta/openlayers/src/openlayersProvider.js
rename to providers/openlayers/src/openlayersProvider.js
index d93f2cfd8..5135171d5 100644
--- a/providers/beta/openlayers/src/openlayersProvider.js
+++ b/providers/openlayers/src/openlayersProvider.js
@@ -1,8 +1,8 @@
 /**
- * @typedef {import('../../../../src/types.js').MapProvider} MapProvider
- * @typedef {import('../../../../src/types.js').MapProviderConfig} MapProviderConfig
+ * @typedef {import('../../../src/types.js').MapProvider} MapProvider
+ * @typedef {import('../../../src/types.js').MapProviderConfig} MapProviderConfig
  */
-import { MapProvider } from '../../../mapProvider.js'
+import { MapProvider } from '../../mapProvider.js'
 import OlMap from 'ol/Map.js'
 import View from 'ol/View.js'
 import { defaults as defaultInteractions } from 'ol/interaction/defaults.js'
diff --git a/providers/beta/openlayers/src/openlayersProvider.test.js b/providers/openlayers/src/openlayersProvider.test.js
similarity index 100%
rename from providers/beta/openlayers/src/openlayersProvider.test.js
rename to providers/openlayers/src/openlayersProvider.test.js
diff --git a/providers/beta/openlayers/src/utils/bngProjection.js b/providers/openlayers/src/utils/bngProjection.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/bngProjection.js
rename to providers/openlayers/src/utils/bngProjection.js
diff --git a/providers/beta/openlayers/src/utils/filterEvaluator.js b/providers/openlayers/src/utils/filterEvaluator.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/filterEvaluator.js
rename to providers/openlayers/src/utils/filterEvaluator.js
diff --git a/providers/beta/openlayers/src/utils/filterEvaluator.test.js b/providers/openlayers/src/utils/filterEvaluator.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/filterEvaluator.test.js
rename to providers/openlayers/src/utils/filterEvaluator.test.js
diff --git a/providers/beta/openlayers/src/utils/highlightFeatures.js b/providers/openlayers/src/utils/highlightFeatures.js
similarity index 99%
rename from providers/beta/openlayers/src/utils/highlightFeatures.js
rename to providers/openlayers/src/utils/highlightFeatures.js
index 6013730c9..8208e21aa 100644
--- a/providers/beta/openlayers/src/utils/highlightFeatures.js
+++ b/providers/openlayers/src/utils/highlightFeatures.js
@@ -7,7 +7,7 @@ import Stroke from 'ol/style/Stroke.js'
 import Fill from 'ol/style/Fill.js'
 import Icon from 'ol/style/Icon.js'
 import { collectTileFragments } from './vtTileFragments.js'
-import { hasSymbol } from '../../../../../src/utils/symbolUtils.js'
+import { hasSymbol } from '../../../../src/utils/symbolUtils.js'
 
 const CRS = 'EPSG:27700'
 const geoJsonFormat = new GeoJSON({ dataProjection: CRS, featureProjection: CRS })
diff --git a/providers/beta/openlayers/src/utils/highlightFeatures.test.js b/providers/openlayers/src/utils/highlightFeatures.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/highlightFeatures.test.js
rename to providers/openlayers/src/utils/highlightFeatures.test.js
diff --git a/providers/beta/openlayers/src/utils/hoverCursor.js b/providers/openlayers/src/utils/hoverCursor.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/hoverCursor.js
rename to providers/openlayers/src/utils/hoverCursor.js
diff --git a/providers/beta/openlayers/src/utils/hoverCursor.test.js b/providers/openlayers/src/utils/hoverCursor.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/hoverCursor.test.js
rename to providers/openlayers/src/utils/hoverCursor.test.js
diff --git a/providers/beta/openlayers/src/utils/openLayersFixes.js b/providers/openlayers/src/utils/openLayersFixes.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/openLayersFixes.js
rename to providers/openlayers/src/utils/openLayersFixes.js
diff --git a/providers/beta/openlayers/src/utils/openLayersFixes.test.js b/providers/openlayers/src/utils/openLayersFixes.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/openLayersFixes.test.js
rename to providers/openlayers/src/utils/openLayersFixes.test.js
diff --git a/providers/beta/openlayers/src/utils/patternImages.js b/providers/openlayers/src/utils/patternImages.js
similarity index 97%
rename from providers/beta/openlayers/src/utils/patternImages.js
rename to providers/openlayers/src/utils/patternImages.js
index 80da10500..3ddb0368e 100644
--- a/providers/beta/openlayers/src/utils/patternImages.js
+++ b/providers/openlayers/src/utils/patternImages.js
@@ -1,5 +1,5 @@
 import Fill from 'ol/style/Fill.js'
-import { RecentImageSets } from '../../../../../src/utils/recentImageSets.js'
+import { RecentImageSets } from '../../../../src/utils/recentImageSets.js'
 
 /**
  * The OpenLayers provider's pattern fills: each pattern image as an ol/style/Fill whose colour
diff --git a/providers/beta/openlayers/src/utils/patternImages.test.js b/providers/openlayers/src/utils/patternImages.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/patternImages.test.js
rename to providers/openlayers/src/utils/patternImages.test.js
diff --git a/providers/beta/openlayers/src/utils/queryFeatures.js b/providers/openlayers/src/utils/queryFeatures.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/queryFeatures.js
rename to providers/openlayers/src/utils/queryFeatures.js
diff --git a/providers/beta/openlayers/src/utils/queryFeatures.test.js b/providers/openlayers/src/utils/queryFeatures.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/queryFeatures.test.js
rename to providers/openlayers/src/utils/queryFeatures.test.js
diff --git a/providers/beta/openlayers/src/utils/spatial.js b/providers/openlayers/src/utils/spatial.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/spatial.js
rename to providers/openlayers/src/utils/spatial.js
diff --git a/providers/beta/openlayers/src/utils/spatial.test.js b/providers/openlayers/src/utils/spatial.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/spatial.test.js
rename to providers/openlayers/src/utils/spatial.test.js
diff --git a/providers/beta/openlayers/src/utils/symbolImages.js b/providers/openlayers/src/utils/symbolImages.js
similarity index 98%
rename from providers/beta/openlayers/src/utils/symbolImages.js
rename to providers/openlayers/src/utils/symbolImages.js
index ea79d6e39..f776c1d0d 100644
--- a/providers/beta/openlayers/src/utils/symbolImages.js
+++ b/providers/openlayers/src/utils/symbolImages.js
@@ -1,7 +1,7 @@
 import IconImage from 'ol/style/IconImage.js'
 import { shared as iconImageCache } from 'ol/style/IconImageCache.js'
 import ImageState from 'ol/ImageState.js'
-import { RecentImageSets } from '../../../../../src/utils/recentImageSets.js'
+import { RecentImageSets } from '../../../../src/utils/recentImageSets.js'
 
 /**
  * The OL "last mile" for symbolRegistry's rasterised symbol images: turns the ImageData
diff --git a/providers/beta/openlayers/src/utils/symbolImages.test.js b/providers/openlayers/src/utils/symbolImages.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/symbolImages.test.js
rename to providers/openlayers/src/utils/symbolImages.test.js
diff --git a/providers/beta/openlayers/src/utils/tileLayers.js b/providers/openlayers/src/utils/tileLayers.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/tileLayers.js
rename to providers/openlayers/src/utils/tileLayers.js
diff --git a/providers/beta/openlayers/src/utils/tileLayers.test.js b/providers/openlayers/src/utils/tileLayers.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/tileLayers.test.js
rename to providers/openlayers/src/utils/tileLayers.test.js
diff --git a/providers/beta/openlayers/src/utils/vtTileFragments.js b/providers/openlayers/src/utils/vtTileFragments.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/vtTileFragments.js
rename to providers/openlayers/src/utils/vtTileFragments.js
diff --git a/providers/beta/openlayers/src/utils/vtTileFragments.test.js b/providers/openlayers/src/utils/vtTileFragments.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/vtTileFragments.test.js
rename to providers/openlayers/src/utils/vtTileFragments.test.js
diff --git a/providers/beta/openlayers/src/utils/zoom.js b/providers/openlayers/src/utils/zoom.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/zoom.js
rename to providers/openlayers/src/utils/zoom.js
diff --git a/providers/beta/openlayers/src/utils/zoom.test.js b/providers/openlayers/src/utils/zoom.test.js
similarity index 100%
rename from providers/beta/openlayers/src/utils/zoom.test.js
rename to providers/openlayers/src/utils/zoom.test.js
diff --git a/rollup.esm.mjs b/rollup.esm.mjs
index 6949afe18..861b9afd7 100644
--- a/rollup.esm.mjs
+++ b/rollup.esm.mjs
@@ -173,7 +173,7 @@ const createESMConfig = (entryPath, outDir, isCore = false, manualChunks = null,
         extensions: ['.js', '.jsx'],
         // Force these packages to resolve from root node_modules only,
         // preventing nested copies inside geojson-rbush and mapbox-gl-snap
-        // from being bundled separately (saves ~200 KB in draw-ml).
+        // from being bundled separately (saves ~200 KB in draw).
         dedupe: ['@turf/meta', '@turf/helpers', 'robust-predicates']
       }),
       commonjs({ include: /node_modules/ }),
@@ -260,30 +260,30 @@ const ALL_BUILDS = [
     manualChunks: (id) => id.includes('/maplibreProvider') ? 'im-maplibre-provider' : undefined
   },
   {
-    entryPath: './providers/beta/open-names/src/index.js',
-    outDir: 'providers/beta/open-names/dist/esm',
+    entryPath: './providers/open-names/src/index.js',
+    outDir: 'providers/open-names/dist/esm',
     manualChunks: (id) => id.includes('/reverseGeocode') ? 'im-reverse-geocode' : undefined
   },
   {
-    entryPath: './providers/beta/esri/src/index.js',
-    outDir: 'providers/beta/esri/dist/esm',
+    entryPath: './providers/esri/src/index.js',
+    outDir: 'providers/esri/dist/esm',
     manualChunks: (id) => id.includes('/esriProvider') ? 'im-esri-provider' : undefined
   },
   {
-    entryPath: './providers/beta/openlayers/src/index.js',
-    outDir: 'providers/beta/openlayers/dist/esm',
+    entryPath: './providers/openlayers/src/index.js',
+    outDir: 'providers/openlayers/dist/esm',
     manualChunks: (id) => id.includes('/openlayersProvider') ? 'im-openlayers-provider' : undefined
   },
 
   // Plugins — each lazy-loads ./manifest.js; manualChunks names that split chunk
   {
-    entryPath: './plugins/beta/scale-bar/src/index.js',
-    outDir: 'plugins/beta/scale-bar/dist/esm',
+    entryPath: './plugins/scale-bar/src/index.js',
+    outDir: 'plugins/scale-bar/dist/esm',
     manualChunks: (id) => id.includes('/manifest') ? 'im-scale-bar-plugin' : undefined
   },
   {
-    entryPath: './plugins/beta/use-location/src/index.js',
-    outDir: 'plugins/beta/use-location/dist/esm',
+    entryPath: './plugins/use-location/src/index.js',
+    outDir: 'plugins/use-location/dist/esm',
     manualChunks: (id) => id.includes('/manifest') ? 'im-use-location-plugin' : undefined
   },
   {
@@ -304,8 +304,8 @@ const ALL_BUILDS = [
     chunkNames: { maplibreLayerAdapter: 'im-datasets-ml-adapter', openlayersLayerAdapter: 'im-datasets-ol-adapter', esriLayerAdapter: 'im-datasets-esri-adapter' }
   },
   {
-    entryPath: './plugins/beta/map-styles/src/index.js',
-    outDir: 'plugins/beta/map-styles/dist/esm',
+    entryPath: './plugins/map-styles/src/index.js',
+    outDir: 'plugins/map-styles/dist/esm',
     manualChunks: (id) => id.includes('/manifest') ? 'im-map-styles-plugin' : undefined
   },
   {
@@ -319,23 +319,13 @@ const ALL_BUILDS = [
     chunkNames: { MaplibreDrawAdapter: 'im-draw-ml-adapter', OLDrawAdapter: 'im-draw-ol-adapter' }
   },
   {
-    entryPath: './plugins/beta/draw-ml/src/index.js',
-    outDir: 'plugins/beta/draw-ml/dist/esm',
-    manualChunks: (id) => id.includes('/manifest') ? 'im-draw-ml-plugin' : undefined
-  },
-  {
-    entryPath: './plugins/beta/draw-es/src/index.js',
-    outDir: 'plugins/beta/draw-es/dist/esm',
+    entryPath: './plugins/draw-es/src/index.js',
+    outDir: 'plugins/draw-es/dist/esm',
     manualChunks: (id) => id.includes('/manifest') ? 'im-draw-es-plugin' : undefined
   },
   {
-    entryPath: './plugins/beta/draw-ol/src/index.js',
-    outDir: 'plugins/beta/draw-ol/dist/esm',
-    manualChunks: (id) => id.includes('/manifest') ? 'im-draw-ol-plugin' : undefined
-  },
-  {
-    entryPath: './plugins/beta/frame/src/index.js',
-    outDir: 'plugins/beta/frame/dist/esm',
+    entryPath: './plugins/frame/src/index.js',
+    outDir: 'plugins/frame/dist/esm',
     manualChunks: (id) => id.includes('/manifest') ? 'im-frame-plugin' : undefined
   },
   {
diff --git a/sonar-project.properties b/sonar-project.properties
index 11bd9ae3e..64c535394 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -11,7 +11,7 @@ sonar.javascript.lcov.reportPaths=coverage/lcov.info
 sonar.sourceEncoding=UTF-8
 
 sonar.sources=src,plugins,providers
-sonar.exclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**,**/__helpers__/**,**/dist/**,**/node_modules/**,plugins/beta/**,providers/beta/**
+sonar.exclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**,**/__helpers__/**,**/dist/**,**/node_modules/**,plugins/draw-es/**,plugins/frame/**,plugins/map-styles/**,plugins/scale-bar/**,plugins/use-location/**,providers/esri/**,providers/open-names/**,providers/openlayers/**
 sonar.tests=src,plugins,providers
 sonar.test.inclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**
 sonar.cpd.exclusions=**/*.test.*,**/__mocks__/**,**/__stubs__/**,**/__helpers__/**
diff --git a/webpack.umd.mjs b/webpack.umd.mjs
index df33ba105..31ec33bd9 100755
--- a/webpack.umd.mjs
+++ b/webpack.umd.mjs
@@ -166,21 +166,20 @@ const ALL_BUILDS = [
 
   // Providers
   { entryPath: './providers/maplibre/src/index.js', libraryPath: 'maplibreProvider', outDir: 'providers/maplibre/dist/umd' },
-  { entryPath: './providers/beta/open-names/src/index.js', libraryPath: 'openNamesProvider', outDir: 'providers/beta/open-names/dist/umd' },
-  { entryPath: './providers/beta/openlayers/src/index.js', libraryPath: 'openLayersProvider', outDir: 'providers/beta/openlayers/dist/umd' },
+  { entryPath: './providers/open-names/src/index.js', libraryPath: 'openNamesProvider', outDir: 'providers/open-names/dist/umd' },
+  { entryPath: './providers/openlayers/src/index.js', libraryPath: 'openLayersProvider', outDir: 'providers/openlayers/dist/umd' },
 
   // Plugins
-  { entryPath: './plugins/beta/scale-bar/src/index.js', libraryPath: 'scaleBarPlugin', outDir: 'plugins/beta/scale-bar/dist/umd' },
-  { entryPath: './plugins/beta/use-location/src/index.js', libraryPath: 'useLocationPlugin', outDir: 'plugins/beta/use-location/dist/umd' },
+  { entryPath: './plugins/scale-bar/src/index.js', libraryPath: 'scaleBarPlugin', outDir: 'plugins/scale-bar/dist/umd' },
+  { entryPath: './plugins/use-location/src/index.js', libraryPath: 'useLocationPlugin', outDir: 'plugins/use-location/dist/umd' },
   { entryPath: './plugins/search/src/index.js', libraryPath: 'searchPlugin', outDir: 'plugins/search/dist/umd' },
   { entryPath: './plugins/interact/src/index.js', libraryPath: 'interactPlugin', outDir: 'plugins/interact/dist/umd' },
   { entryPath: './plugins/datasets/src/index.js', libraryPath: 'datasetsPlugin', outDir: 'plugins/datasets/dist/umd', cssOutDir: 'plugins/datasets/dist' },
   { entryPath: './plugins/map-key/src/index.js', libraryPath: 'mapKeyPlugin', outDir: 'plugins/map-key/dist/umd', cssOutDir: 'plugins/map-key/dist' },
   { entryPath: './plugins/menu/src/index.js', libraryPath: 'menuPlugin', outDir: 'plugins/menu/dist/umd', cssOutDir: 'plugins/menu/dist' },
-  { entryPath: './plugins/beta/map-styles/src/index.js', libraryPath: 'mapStylesPlugin', outDir: 'plugins/beta/map-styles/dist/umd' },
+  { entryPath: './plugins/map-styles/src/index.js', libraryPath: 'mapStylesPlugin', outDir: 'plugins/map-styles/dist/umd' },
   { entryPath: './plugins/draw/src/index.js', libraryPath: 'drawPlugin', outDir: 'plugins/draw/dist/umd' },
-  { entryPath: './plugins/beta/draw-ml/src/index.js', libraryPath: 'drawMLPlugin', outDir: 'plugins/beta/draw-ml/dist/umd' },
-  { entryPath: './plugins/beta/frame/src/index.js', libraryPath: 'framePlugin', outDir: 'plugins/beta/frame/dist/umd' }
+  { entryPath: './plugins/frame/src/index.js', libraryPath: 'framePlugin', outDir: 'plugins/frame/dist/umd' }
 ]
 
 // === Filter via environment variable ===