Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ModifiersSpec.java	(revision 10894)
+++ 	(revision )
@@ -1,58 +1,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.actions.mapmode;
-
-/**
- * TODO: rewrite to use awt modifers flag instead.
- *
- * @author Ole Jørgen Brønner (olejorgenb)
- */
-public class ModifiersSpec {
-    public static final int ON = 1, OFF = 0, UNKNOWN = 2;
-    public int alt = UNKNOWN;
-    public int shift = UNKNOWN;
-    public int ctrl = UNKNOWN;
-
-    /**
-     *  'A' = Alt, 'S' = Shift, 'C' = Ctrl
-     *  Lowercase signifies off and '?' means unknown/optional.
-     *  Order is Alt, Shift, Ctrl
-     * @param str 3 letters string defining modifiers
-     */
-    public ModifiersSpec(String str) {
-        assert str.length() == 3;
-        char a = str.charAt(0);
-        char s = str.charAt(1);
-        char c = str.charAt(2);
-        // @formatter:off
-        // CHECKSTYLE.OFF: SingleSpaceSeparator
-        alt   = a == '?' ? UNKNOWN : (a == 'A' ? ON : OFF);
-        shift = s == '?' ? UNKNOWN : (s == 'S' ? ON : OFF);
-        ctrl  = c == '?' ? UNKNOWN : (c == 'C' ? ON : OFF);
-        // CHECKSTYLE.ON: SingleSpaceSeparator
-        // @formatter:on
-    }
-
-    public ModifiersSpec(final int alt, final int shift, final int ctrl) {
-        this.alt = alt;
-        this.shift = shift;
-        this.ctrl = ctrl;
-    }
-
-    public boolean matchWithKnown(final int knownAlt, final int knownShift, final int knownCtrl) {
-        return match(alt, knownAlt) && match(shift, knownShift) && match(ctrl, knownCtrl);
-    }
-
-    public boolean matchWithKnown(final boolean knownAlt, final boolean knownShift, final boolean knownCtrl) {
-        return match(alt, knownAlt) && match(shift, knownShift) && match(ctrl, knownCtrl);
-    }
-
-    private static boolean match(final int a, final int knownValue) {
-        assert knownValue == ON | knownValue == OFF;
-        return a == knownValue || a == UNKNOWN;
-    }
-
-    private static boolean match(final int a, final boolean knownValue) {
-        return a == (knownValue ? ON : OFF) || a == UNKNOWN;
-    }
-    // does java have built in 3-state support?
-}
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 10894)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 10895)
@@ -106,18 +106,4 @@
     private static final String WIKI_PROTOCOL  = "wiki://";
     // CHECKSTYLE.ON: SingleSpaceSeparator
-
-    /**
-     * Position of an overlay icon
-     */
-    public enum OverlayPosition {
-        /** North west */
-        NORTHWEST,
-        /** North east */
-        NORTHEAST,
-        /** South west */
-        SOUTHWEST,
-        /** South east */
-        SOUTHEAST
-    }
 
     /**