Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java	(revision 29524)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java	(revision 29525)
@@ -556,5 +556,5 @@
                     System.out.println("Try to grab into a new layer when "+wmsLayer.getName()+" is already opened.");
                     // remove the duplicated layer
-                    Main.map.mapView.removeLayer(wmsLayer);
+                    Main.main.removeLayer(wmsLayer);
                     throw new DuplicateLayerException();
                 }
Index: applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java
===================================================================
--- applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java	(revision 29524)
+++ applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java	(revision 29525)
@@ -66,5 +66,5 @@
         actionCompleted();
         if (wmsLayer != null) {
-            Main.map.mapView.removeLayer(wmsLayer);
+            Main.main.removeLayer(wmsLayer);
             wmsLayer = null;
         }
@@ -278,5 +278,5 @@
         if (selectedValue == 0) { // "Cancel"
             // remove layer
-            Main.map.mapView.removeLayer(wmsLayer);
+            Main.main.removeLayer(wmsLayer);
             wmsLayer = null;
             Main.map.mapView.removeMouseListener(this);
Index: applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java
===================================================================
--- applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java	(revision 29524)
+++ applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java	(revision 29525)
@@ -252,5 +252,5 @@
         } else if (oldLayer == Main.map.mapView.getEditLayer()) { //data layer removed
             if (graphViewLayer != null) {
-                Main.map.mapView.removeLayer(graphViewLayer);
+                Main.main.removeLayer(graphViewLayer);
                 graphViewLayer = null;
             }
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java	(revision 29524)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/DigraphCreationTask.java	(revision 29525)
@@ -55,5 +55,5 @@
 	protected void finish() {
 		if (canceled) {
-			Main.map.mapView.removeLayer(plugin.getChannelDigraphLayer());
+			Main.main.removeLayer(plugin.getChannelDigraphLayer());
 			return;
 		}
Index: applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java
===================================================================
--- applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java	(revision 29524)
+++ applications/editors/josm/plugins/mapdust/src/org/openstreetmap/josm/plugins/mapdust/MapdustPlugin.java	(revision 29525)
@@ -452,5 +452,5 @@
                     MapdustPluginState.ONLINE.getValue());
             NavigatableComponent.removeZoomChangeListener(this);
-            Main.map.mapView.removeLayer(layer);
+            Main.main.removeLayer(layer);
             if (mapdustGUI != null) {
                 Main.map.remove(mapdustGUI);
Index: applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java
===================================================================
--- applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 29524)
+++ applications/editors/josm/plugins/routing/src/com/innovant/josm/plugin/routing/RoutingPlugin.java	(revision 29525)
@@ -270,5 +270,5 @@
 					try {
 						// Remove layer
-						Main.map.mapView.removeLayer(layersArray[i]);
+						Main.main.removeLayer(layersArray[i]);
 					} catch (IllegalArgumentException e) {
 					}