Index: /trunk/src/org/openstreetmap/josm/Main.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/Main.java	(revision 10974)
+++ /trunk/src/org/openstreetmap/josm/Main.java	(revision 10975)
@@ -166,5 +166,5 @@
 
     /**
-     * The MapFrame. Use {@link Main#setMapFrame} to set or clear it.
+     * The MapFrame.
      * <p>
      * There should be no need to access this to access any map data. Use {@link #layerManager} instead.
Index: /trunk/src/org/openstreetmap/josm/gui/MainPanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainPanel.java	(revision 10974)
+++ /trunk/src/org/openstreetmap/josm/gui/MainPanel.java	(revision 10975)
@@ -76,7 +76,5 @@
         // Notify map frame listeners, mostly plugins.
         for (MapFrameListener listener : mapFrameListeners) {
-            MapView.fireDeprecatedListenerOnAdd = true;
             listener.mapFrameInitialized(old, map);
-            MapView.fireDeprecatedListenerOnAdd = false;
         }
         if (map == null && Main.currentProgressMonitor != null) {
Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 10974)
+++ /trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 10975)
@@ -56,5 +56,4 @@
 import org.openstreetmap.josm.gui.layer.LayerManager;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
-import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerOrderChangeEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerRemoveEvent;
@@ -186,13 +185,4 @@
         }
     }
-
-    /**
-     * Temporary. To be removed as soon as the {@link LayerChangeListener}s are removed.
-     * <p>
-     * Some plugins add their listeners in {@link Main#setMapFrame(MapFrame)}. This method is now called just after the first layer was added to
-     * the layer manager. So that listener would not receive the addition of the first layer. As long as this field is set, we fake an add call
-     * to that listener when it is added to immitate the old behaviour. You should not access it from anywhere else.
-     */
-    public static boolean fireDeprecatedListenerOnAdd;
 
     public boolean viewportFollowing;