Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 10838)
+++ /trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 10839)
@@ -219,19 +219,4 @@
     }
 
-    /**
-     * Old color interface
-     * <p>
-     * To be removed: end of 2016
-     * @deprecated Use a {@link ColorProperty} instead.
-     */
-    @Deprecated
-    public interface ColorKey {
-        String getColorName();
-
-        String getSpecialName();
-
-        Color getDefaultValue();
-    }
-
     private final ListenerList<PreferenceChangedListener> listeners = ListenerList.create();
 
@@ -824,17 +809,4 @@
         }
         return tr(I18n.escape(colornames.containsKey(o) ? colornames.get(o) : o));
-    }
-
-    /**
-     * Returns the color for the given key.
-     * <p>
-     * To be removed: end of 2016
-     * @param key The color key
-     * @return the color
-     * @deprecated Use a {@link ColorProperty} instead.
-     */
-    @Deprecated
-    public Color getColor(ColorKey key) {
-        return getColor(key.getColorName(), key.getSpecialName(), key.getDefaultValue());
     }