diff --git a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
index b86630c2d55c683c5b0dbc042fce85fb31d7eb90..7e05082ce3d6587d8c30177e8cb8ac8e22c02e0e 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenProcessFactory.java
@@ -25,14 +25,9 @@ package hudson.maven;
 
 import hudson.FilePath;
 import hudson.Launcher;
-import hudson.Proc;
-import hudson.AbortException;
 import hudson.EnvVars;
-import hudson.slaves.Channels;
-import static hudson.Util.fixNull;
 import hudson.maven.agent.Main;
 import hudson.maven.agent.Maven21Interceptor;
-import hudson.maven.ProcessCache.NewProcess;
 import hudson.model.BuildListener;
 import hudson.model.Computer;
 import hudson.model.Executor;
@@ -42,31 +37,13 @@ import hudson.model.Node;
 import hudson.model.Run.RunnerAbortedException;
 import hudson.model.TaskListener;
 import hudson.remoting.Callable;
-import hudson.remoting.Channel;
-import hudson.remoting.RemoteInputStream;
-import hudson.remoting.RemoteOutputStream;
-import hudson.remoting.SocketInputStream;
-import hudson.remoting.SocketOutputStream;
 import hudson.remoting.Which;
 import hudson.tasks.Maven.MavenInstallation;
-import hudson.tasks._maven.MavenConsoleAnnotator;
 import hudson.util.ArgumentListBuilder;
-import hudson.util.IOException2;
 
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.SocketTimeoutException;
-import java.nio.charset.Charset;
-import java.nio.charset.UnsupportedCharsetException;
-import java.util.Arrays;
 import java.util.logging.Logger;
 
 
diff --git a/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java b/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java
index 846d9233f3d89f00e73e7ba02991971b340a5e35..890f739ad815eab0d5e883e01e08de285d0292e2 100644
--- a/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java
+++ b/maven-plugin/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java
@@ -24,27 +24,15 @@
  */
 package hudson.maven.reporters;
 
-import hudson.FilePath;
-import hudson.Util;
 import hudson.Extension;
-import hudson.maven.MavenBuildProxy;
 import hudson.maven.MavenModule;
-import hudson.maven.MavenReporter;
 import hudson.maven.MavenReporterDescriptor;
 import hudson.maven.MojoInfo;
 import hudson.maven.MavenModuleSet;
-import hudson.maven.MavenReportInfo;
 import hudson.model.*;
-import hudson.tasks.JavadocArchiver.JavadocAction;
-import org.apache.maven.project.MavenProject;
-import org.codehaus.plexus.component.configurator.ComponentConfigurationException;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.List;
 
 /**
  * Records the javadoc and archives it.