@@Index: core/src/main/java/hudson/model/Hudson.java
===================================================================
--- core/src/main/java/hudson/model/Hudson.java (revision 27516)
+++ core/src/main/java/hudson/model/Hudson.java (working copy)
@@ -61,8 +61,6 @@
 import hudson.lifecycle.RestartNotSupportedException;
 import hudson.model.Descriptor.FormException;
 import hudson.model.listeners.ItemListener;
-import hudson.model.listeners.JobListener;
-import hudson.model.listeners.JobListener.JobListenerAdapter;
 import hudson.model.listeners.SCMListener;
 import hudson.model.listeners.SaveableListener;
 import hudson.remoting.Channel;
@@ -940,26 +938,6 @@
     }

     /**
-     * Adds a new {@link JobListener}.
-     *
-     * @deprecated since 2007-01-04.
-     *      Use {@code getJobListeners().add(l)} instead.
-     */
-    public void addListener(JobListener l) {
-        itemListeners.add(new JobListenerAdapter(l));
-    }
-
-    /**
-     * Deletes an existing {@link JobListener}.
-     *
-     * @deprecated since 2007-01-04.
-     *      Use {@code getJobListeners().remove(l)} instead.
-     */
-    public boolean removeListener(JobListener l ) {
-        return itemListeners.remove(new JobListenerAdapter(l));
-    }
-
-    /**
      * Gets all the installed {@link ItemListener}s.
      *
      * @deprecated as of 1.286.

@@Index: core/src/main/java/hudson/model/DirectoryBrowserSupport.java
===================================================================
--- core/src/main/java/hudson/model/DirectoryBrowserSupport.java    (revision 27516)
+++ core/src/main/java/hudson/model/DirectoryBrowserSupport.java    (working copy)
@@ -73,14 +73,6 @@
     private String indexFileName = "index.html";

     /**
-     * @deprecated since 2007-08-12.
-     *      Use {@link #DirectoryBrowserSupport(ModelObject, FilePath, String, String, boolean)}
-     */
-    public DirectoryBrowserSupport(ModelObject owner) {
-        this(owner,owner.getDisplayName());
-    }
-
-    /**
      * @deprecated as of 1.297
      *      Use {@link #DirectoryBrowserSupport(ModelObject, FilePath, String, String, boolean)}
      */

@@Index: core/src/main/java/hudson/model/Descriptor.java
===================================================================
--- core/src/main/java/hudson/model/Descriptor.java (revision 27516)
+++ core/src/main/java/hudson/model/Descriptor.java (working copy)
@@ -477,20 +482,10 @@

     /**
      * @deprecated
-     *      As of 1.64. Use {@link #configure(StaplerRequest)}.
-     */
-    @Deprecated
-    public boolean configure( HttpServletRequest req ) throws FormException {
-        return true;
-    }
-
-    /**
-     * @deprecated
      *      As of 1.239, use {@link #configure(StaplerRequest, JSONObject)}.
      */
     public boolean configure( StaplerRequest req ) throws FormException {
-        // compatibility
-        return configure( (HttpServletRequest) req );
+        return true;
     }

     /**
@@ -560,27 +555,12 @@
             return;

         try {
-            Object o = file.unmarshal(this);
-            if(o instanceof Map) {
-                // legacy format
-                @SuppressWarnings("unchecked")
-                Map<String,Object> _o = (Map) o;
-                convert(_o);
-                save();     // convert to the new format
-            }
+            file.unmarshal(this);
         } catch (IOException e) {
             LOGGER.log(Level.WARNING, "Failed to load "+file, e);
         }
     }

-    /**
-     * {@link Descriptor}s that has existed <= 1.61 needs to
-     * be able to read in the old configuration in a property bag
-     * and reflect that into the new layout.
-     */
-    protected void convert(Map<String, Object> oldPropertyBag) {
-    }
-
     private XmlFile getConfigFile() {
         return new XmlFile(new File(Hudson.getInstance().getRootDir(),clazz.getName()+".xml"));
     }

@@Index: core/src/main/java/hudson/tasks/Maven.java
===================================================================
--- core/src/main/java/hudson/tasks/Maven.java  (revision 27516)
+++ core/src/main/java/hudson/tasks/Maven.java  (working copy)
@@ -328,12 +327,6 @@
         }

         @Override
-        protected void convert(Map<String, Object> oldPropertyBag) {
-            if(oldPropertyBag.containsKey("installations"))
-                installations = (MavenInstallation[]) oldPropertyBag.get("installations");
-        }
-
-        @Override
         public String getHelpFile() {
             return "/help/project-config/maven.html";
         }

@@Index: core/src/main/java/hudson/tasks/Shell.java
===================================================================
--- core/src/main/java/hudson/tasks/Shell.java  (revision 27516)
+++ core/src/main/java/hudson/tasks/Shell.java  (working copy)
@@ -128,11 +126,6 @@
             return true;
         }

-        @Override
-        protected void convert(Map<String, Object> oldPropertyBag) {
-            shell = (String)oldPropertyBag.get("shell");
-        }
-
         public String getShell() {
             return shell;
         }

@@Index: core/src/main/java/hudson/tasks/Mailer.java
===================================================================
--- core/src/main/java/hudson/tasks/Mailer.java (revision 27516)
+++ core/src/main/java/hudson/tasks/Mailer.java (working copy)
@@ -193,19 +192,6 @@
             DESCRIPTOR = this;
         }

-        /**
-         * For backward compatibility.
-         */
-        @Override
-        protected void convert(Map<String, Object> oldPropertyBag) {
-            defaultSuffix = (String)oldPropertyBag.get("mail.default.suffix");
-            hudsonUrl = (String)oldPropertyBag.get("mail.hudson.url");
-            smtpAuthUsername = (String)oldPropertyBag.get("mail.hudson.smtpauth.username");
-            smtpAuthPassword = Secret.fromString((String)oldPropertyBag.get("mail.hudson.smtpauth.password"));
-            adminAddress = (String)oldPropertyBag.get("mail.admin.address");
-            smtpHost = (String)oldPropertyBag.get("mail.smtp.host");
-        }
-
         public String getDisplayName() {
             return Messages.Mailer_DisplayName();
         }

@@Index: core/src/main/java/hudson/tasks/Ant.java
===================================================================
--- core/src/main/java/hudson/tasks/Ant.java    (revision 27516)
+++ core/src/main/java/hudson/tasks/Ant.java    (working copy)
@@ -266,11 +265,6 @@
             return true;
         }

-        protected void convert(Map<String,Object> oldPropertyBag) {
-            if(oldPropertyBag.containsKey("installations"))
-                installations = (AntInstallation[]) oldPropertyBag.get("installations");
-        }
-
         @Override
         public String getHelpFile() {
             return "/help/project-config/ant.html";