Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java	(revision 12288)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxTrack.java	(revision 12289)
@@ -36,15 +36,4 @@
      */
     double length();
-
-    /**
-     * Returns the number of times this track has been changed.
-     * @return Number of times this track has been changed. Always 0 for read-only tracks
-     * @deprecated since 12156 Replaced by change listeners.
-     */
-    @Deprecated
-    default int getUpdateCount() {
-        // to allow removal
-        return 0;
-    }
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java	(revision 12288)
+++ trunk/src/org/openstreetmap/josm/data/gpx/ImmutableGpxTrack.java	(revision 12289)
@@ -84,9 +84,4 @@
 
     @Override
-    public int getUpdateCount() {
-        return 0;
-    }
-
-    @Override
     public int hashCode() {
         return 31 * super.hashCode() + ((segments == null) ? 0 : segments.hashCode());
Index: trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java	(revision 12288)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/projection/AbstractProjectionChoice.java	(revision 12289)
@@ -51,14 +51,4 @@
     }
 
-    /**
-     * Get the cache directory name.
-     * @return the cache directory name (base name)
-     * @deprecated unused - remove in 2017-07
-     */
-    @Deprecated
-    public String getCacheDir() {
-        return cacheDir;
-    }
-
     @Override
     public String toString() {
@@ -74,5 +64,5 @@
         String code = getCurrentCode();
         return new CustomProjection(getProjectionName(), code, Optional.ofNullable(Projections.getInit(code))
-                .orElseThrow(() -> new AssertionError("Error: Unknown projection code: " + code)), getCacheDir());
+                .orElseThrow(() -> new AssertionError("Error: Unknown projection code: " + code)), cacheDir);
     }
 }