Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 14003)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 14005)
@@ -238,49 +238,4 @@
 
     /**
-     * Returns the user defined preferences directory, containing the preferences.xml file
-     * @return The user defined preferences directory, containing the preferences.xml file
-     * @since 7834
-     * @deprecated use {@link #getPreferencesDirectory(boolean)}
-     */
-    @Deprecated
-    public File getPreferencesDirectory() {
-        return getPreferencesDirectory(false);
-    }
-
-    /**
-     * @param createIfMissing if true, automatically creates this directory,
-     * in case it is missing
-     * @return the preferences directory
-     * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
-     */
-    @Deprecated
-    public File getPreferencesDirectory(boolean createIfMissing) {
-        return dirs.getPreferencesDirectory(createIfMissing);
-    }
-
-    /**
-     * Returns the user data directory, containing autosave, plugins, etc.
-     * Depending on the OS it may be the same directory as preferences directory.
-     * @return The user data directory, containing autosave, plugins, etc.
-     * @since 7834
-     * @deprecated use {@link #getUserDataDirectory(boolean)}
-     */
-    @Deprecated
-    public File getUserDataDirectory() {
-        return getUserDataDirectory(false);
-    }
-
-    /**
-     * @param createIfMissing if true, automatically creates this directory,
-     * in case it is missing
-     * @return the user data directory
-     * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
-     */
-    @Deprecated
-    public File getUserDataDirectory(boolean createIfMissing) {
-        return dirs.getUserDataDirectory(createIfMissing);
-    }
-
-    /**
      * Returns the user preferences file (preferences.xml).
      * @return The user preferences file (preferences.xml)
@@ -304,28 +259,4 @@
     public File getPluginsDirectory() {
         return new File(dirs.getUserDataDirectory(false), "plugins");
-    }
-
-    /**
-     * Get the directory where cached content of any kind should be stored.
-     *
-     * If the directory doesn't exist on the file system, it will be created by this method.
-     *
-     * @return the cache directory
-     * @deprecated use {@link #getCacheDirectory(boolean)}
-     */
-    @Deprecated
-    public File getCacheDirectory() {
-        return getCacheDirectory(true);
-    }
-
-    /**
-     * @param createIfMissing if true, automatically creates this directory,
-     * in case it is missing
-     * @return the cache directory
-     * @deprecated use {@link #getDirs()} or (more generally) {@link Config#getDirs()}
-     */
-    @Deprecated
-    public File getCacheDirectory(boolean createIfMissing) {
-        return dirs.getCacheDirectory(createIfMissing);
     }
 
Index: trunk/src/org/openstreetmap/josm/data/osm/Tag.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Tag.java	(revision 14003)
+++ trunk/src/org/openstreetmap/josm/data/osm/Tag.java	(revision 14005)
@@ -10,5 +10,4 @@
 
 import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -141,16 +140,4 @@
 
     /**
-     * Removes leading, trailing, and multiple inner whitespaces from the given string, to be used as a key or value.
-     * @param s The string
-     * @return The string without leading, trailing or multiple inner whitespaces
-     * @since 6699
-     * @deprecated since 13597. Use {@link Utils#removeWhiteSpaces(String)} instead
-     */
-    @Deprecated
-    public static String removeWhiteSpaces(String s) {
-        return Utils.removeWhiteSpaces(s);
-    }
-
-    /**
      * Unsupported.
      * @param keys ignored