Index: trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java	(revision 8771)
+++ trunk/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java	(revision 8772)
@@ -311,49 +311,4 @@
     }
 
-    @Override
-    public double lonToTileX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileXToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileYToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double getDistance(double lat1, double lon1, double lat2, double lon2) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public int lonToX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public int latToY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double XToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double YToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double latToTileY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
     /**
      * Checks if url is acceptable by this Tile Source
Index: trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 8771)
+++ trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java	(revision 8772)
@@ -495,29 +495,4 @@
 
     @Override
-    public int lonToX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public int latToY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double XToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double YToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double latToTileY(double lat, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
     public ICoordinate tileXYToLatLon(Tile tile) {
         return tileXYToLatLon(tile.getXtile(), tile.getYtile(), tile.getZoom());
@@ -622,19 +597,4 @@
 
     @Override
-    public double lonToTileX(double lon, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileXToLon(int x, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
-    public double tileYToLat(int y, int zoom) {
-        throw new UnsupportedOperationException("Not implemented");
-    }
-
-    @Override
     public Map<String, String> getHeaders() {
         return headers;
@@ -653,5 +613,4 @@
         return getTileUrl(zoom, tilex, tiley);
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8771)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java	(revision 8772)
@@ -128,4 +128,5 @@
             new DeprecatedPlugin("notes", IN_CORE),
             new DeprecatedPlugin("mirrored_download", IN_CORE),
+            new DeprecatedPlugin("imagerycache", IN_CORE),
         });
     }