diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index 2e445ef49e..31553bb1b2 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -64,13 +64,13 @@
       <artifactId>commons-cli</artifactId>
       <version>1.0-beta-2</version>
     </dependency>
-    <!-- TODO: only here for classloader issues. It used to work when the script classes were inside the component factory... -->
+    <!-- TODO: only here for classloader issues. It used to work when the script classes were inside the component factory...
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-script-beanshell</artifactId>
       <version>2.0-SNAPSHOT</version>
       <scope>runtime</scope>
-    </dependency>
+    </dependency> -->
     <dependency>
       <groupId>plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
index 96ebf62483..e0b97dfa45 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
@@ -771,12 +771,12 @@ public class DefaultPluginManager
     public void initialize()
     {
         // TODO: configure this from bootstrap or scan lib
-        artifactFilter = new ExclusionSetFilter( new String[]{"bsh", "classworlds", "doxia-core", "maven-artifact",
+        artifactFilter = new ExclusionSetFilter( new String[]{/*"bsh",*/ "classworlds", "doxia-core", "maven-artifact",
                                                               "maven-core", "maven-model", "maven-monitor",
                                                               "maven-plugin-api", "maven-plugin-descriptor",
                                                               "maven-project", "maven-reporting-api",
-                                                              "maven-script-beanshell", "maven-settings",
-                                                              "plexus-bsh-factory", "plexus-container-default",
+                                                              /*"maven-script-beanshell", */"maven-settings",
+                                                              /*"plexus-bsh-factory", */"plexus-container-default",
                                                               "plexus-utils", "wagon-provider-api"} );
     }