Index: /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java	(revision 8905)
+++ /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java	(revision 8906)
@@ -42,17 +42,4 @@
     public EastNorth add(EastNorth other) {
         return new EastNorth(x+other.x, y+other.y);
-    }
-
-    /**
-     * Subtracts the coordinates of this EastNorth instance from the other one.
-     * <p>
-     * This produces result = en2 - this.
-     * @param en2 The instance to subtract this one from.
-     * @return The new EastNorth position.
-     * @deprecated use {@code subtract} on the other EastNorth instead
-     */
-    @Deprecated
-    public EastNorth sub(EastNorth en2) {
-        return en2.subtract(this);
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/MainMenu.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8905)
+++ /trunk/src/org/openstreetmap/josm/gui/MainMenu.java	(revision 8906)
@@ -598,13 +598,4 @@
 
     /**
-     * @deprecated Use {@link #addMenu(String, String, int, int, String)} instead.
-     */
-    // Kept for compatibility with plugins
-    @Deprecated
-    public JMenu addMenu(String name, int mnemonicKey, int position, String relativeHelpTopic) {
-        return addMenu(name, tr(name), mnemonicKey, position, relativeHelpTopic);
-    }
-
-    /**
      * Creates a menu and adds it on the given position to the main menu.
      *
Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8905)
+++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java	(revision 8906)
@@ -75,13 +75,4 @@
     }
 
-    /**
-     * Interface to notify listeners of the change of the system of measurement.
-     * @since 6056
-     * @deprecated use {@link org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener} instead.
-     */
-    @Deprecated
-    public interface SoMChangeListener extends SystemOfMeasurement.SoMChangeListener {
-    }
-
     public transient Predicate<OsmPrimitive> isSelectablePredicate = new Predicate<OsmPrimitive>() {
         @Override
@@ -132,52 +123,4 @@
             l.zoomChanged();
         }
-    }
-
-
-    /**
-     * Removes a SoM change listener.
-     *
-     * @param listener the listener. Ignored if null or already absent
-     * @since 6056
-     * @deprecated use {@link SystemOfMeasurement#removeSoMChangeListener} instead.
-     */
-    @Deprecated
-    public static void removeSoMChangeListener(NavigatableComponent.SoMChangeListener listener) {
-        SystemOfMeasurement.removeSoMChangeListener(listener);
-    }
-
-    /**
-     * Adds a SoM change listener
-     *
-     * @param listener the listener. Ignored if null or already registered.
-     * @since 6056
-     * @deprecated use {@link SystemOfMeasurement#addSoMChangeListener} instead.
-     */
-    @Deprecated
-    public static void addSoMChangeListener(NavigatableComponent.SoMChangeListener listener) {
-        SystemOfMeasurement.addSoMChangeListener(listener);
-    }
-
-    /**
-     * Returns the current system of measurement.
-     * @return The current system of measurement (metric system by default).
-     * @since 3490
-     * @deprecated use {@link SystemOfMeasurement#getSystemOfMeasurement} instead.
-     */
-    @Deprecated
-    public static SystemOfMeasurement getSystemOfMeasurement() {
-        return SystemOfMeasurement.getSystemOfMeasurement();
-    }
-
-    /**
-     * Sets the current system of measurement.
-     * @param somKey The system of measurement key. Must be defined in {@link SystemOfMeasurement#ALL_SYSTEMS}.
-     * @throws IllegalArgumentException if {@code somKey} is not known
-     * @since 6056
-     * @deprecated use {@link SystemOfMeasurement#setSystemOfMeasurement} instead.
-     */
-    @Deprecated
-    public static void setSystemOfMeasurement(String somKey) {
-        SystemOfMeasurement.setSystemOfMeasurement(somKey);
     }
 
Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 8905)
+++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java	(revision 8906)
@@ -140,15 +140,4 @@
     }
 
-    /**
-     * Checks that WMS layer is a grabber-compatible one (HTML or WMS).
-     * @throws IllegalStateException if imagery time is neither HTML nor WMS
-     * @since 8068
-     * @deprecated not implemented anymore
-     */
-    @Deprecated
-    public void checkGrabberType() {
-        // not implemented
-    }
-
     @Override
     protected Class<? extends TileLoader> getTileLoaderClass() {