diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
index 2d53f6be16..59eb4c3f48 100755
--- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
+++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/AbstractArtifactTask.java
@@ -78,9 +78,6 @@ protected ArtifactRepository createLocalArtifactRepository()
         ArtifactRepositoryLayout repositoryLayout =
             (ArtifactRepositoryLayout) lookup( ArtifactRepositoryLayout.ROLE, localRepository.getLayout() );
 
-        CustomWagonManager manager = (CustomWagonManager) lookup( WagonManager.ROLE );
-        manager.setLocalRepository( localRepository.getLocation() );
-
         return new DefaultArtifactRepository( "local", "file://" + localRepository.getLocation(), repositoryLayout );
     }
 
diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/CustomWagonManager.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/CustomWagonManager.java
deleted file mode 100755
index a127d1a1ab..0000000000
--- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/CustomWagonManager.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.apache.maven.artifact.ant;
-
-/*
- * Copyright 2001-2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.apache.maven.artifact.manager.DefaultWagonManager;
-import org.apache.maven.wagon.UnsupportedProtocolException;
-import org.apache.maven.wagon.Wagon;
-
-import java.io.File;
-
-/**
- * Custom wagon manager for the ant tasks - used to set the SCM checkout directory to the local repository.
- *
- * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @version $Id$
- * @todo find a better way and share with m2
- */
-public class CustomWagonManager
-    extends DefaultWagonManager
-{
-    private File localRepository;
-
-    public Wagon getWagon( String protocol )
-        throws UnsupportedProtocolException
-    {
-        Wagon wagon = super.getWagon( protocol );
-
-        if ( protocol.equals( "scm" ) )
-        {
-            // TODO
-//            ((ScmWagon)wagon).setCheckoutDirectory( localRepository );
-        }
-
-        return wagon;
-    }
-
-    public void setLocalRepository( File localRepository )
-    {
-        this.localRepository = localRepository;
-    }
-
-}
diff --git a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
index 9614e5db02..c7133c9e7f 100755
--- a/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
+++ b/maven-artifact-ant/src/main/java/org/apache/maven/artifact/ant/DependenciesTask.java
@@ -119,7 +119,7 @@ protected void doExecute()
         Set artifacts;
         try
         {
-            artifacts = metadataSource.createArtifacts( artifactFactory, dependencies, null, null, null );
+            artifacts = MavenMetadataSource.createArtifacts( artifactFactory, dependencies, null, null, null );
 
             Artifact pomArtifact = artifactFactory.createBuildArtifact( pom.getGroupId(), pom.getArtifactId(), pom
                 .getVersion(), pom.getPackaging() );
diff --git a/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml b/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
deleted file mode 100644
index 73ca2c3ed1..0000000000
--- a/maven-artifact-ant/src/main/resources/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.artifact.manager.WagonManager</role>
-      <implementation>org.apache.maven.artifact.ant.CustomWagonManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-  </components>
-</component-set>