diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index bff19e0f65b..56f2a49d9cc 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -240,33 +240,6 @@
               <outputDirectory>${assembly-directory}/lib/annotations</outputDirectory>
             </configuration>
           </execution>
-
-          <execution>
-            <id>copy-jta-deps</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>javax.transaction</includeGroupIds>
-              <includeArtifactIds>javax.transaction-api</includeArtifactIds>
-              <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>copy-jndi-deps</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <includeGroupIds>org.eclipse.jetty.orbit</includeGroupIds>
-              <includeArtifactIds>javax.mail.glassfish</includeArtifactIds>
-              <includeTypes>jar</includeTypes>
-              <outputDirectory>${assembly-directory}/lib/jndi</outputDirectory>
-            </configuration>
-          </execution>
           <execution>
             <id>copy-apache-jsp-deps</id>
             <phase>generate-resources</phase>
@@ -397,10 +370,6 @@
   </build>
   <dependencies>
     <!-- Orbit Deps -->
-    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.mail.glassfish</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.security.auth.message</artifactId>
@@ -410,10 +379,6 @@
       <groupId>javax.annotation</groupId>
       <artifactId>javax.annotation-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.transaction</groupId>
-      <artifactId>javax.transaction-api</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.ow2.asm</groupId>
diff --git a/jetty-jndi/src/main/assembly/config.xml b/jetty-jndi/src/main/assembly/config.xml
deleted file mode 100644
index fd02dcee4a7..00000000000
--- a/jetty-jndi/src/main/assembly/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>config</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <scope>provided</scope>
-      <outputDirectory>lib/mail</outputDirectory>
-      <includes>
-        <include>org.eclipse.jetty.orbit:javax.mail.glassfish</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/jndi-config</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>**</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
-
diff --git a/jetty-jndi/src/main/jndi-config/modules/jndi.mod b/jetty-jndi/src/main/config/modules/jndi.mod
similarity index 85%
rename from jetty-jndi/src/main/jndi-config/modules/jndi.mod
rename to jetty-jndi/src/main/config/modules/jndi.mod
index 023ff9845a4..39fc8069c0d 100644
--- a/jetty-jndi/src/main/jndi-config/modules/jndi.mod
+++ b/jetty-jndi/src/main/config/modules/jndi.mod
@@ -3,9 +3,6 @@ Adds the Jetty JNDI implementation to the classpath.
 
 [depend]
 server
-mail
 
 [lib]
 lib/jetty-jndi-${jetty.version}.jar
-lib/jndi/*.jar
-
diff --git a/jetty-jndi/src/main/jndi-config/modules/mail.mod b/jetty-jndi/src/main/jndi-config/modules/mail.mod
deleted file mode 100644
index 1dd711dfc7a..00000000000
--- a/jetty-jndi/src/main/jndi-config/modules/mail.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[description]
-Adds the javax.mail implementation to the classpath.
-
-[name]
-mail
-
-[lib]
-lib/mail/*.jar
diff --git a/jetty-plus/pom.xml b/jetty-plus/pom.xml
index 05dd0d404f4..9fe9b2d9207 100644
--- a/jetty-plus/pom.xml
+++ b/jetty-plus/pom.xml
@@ -60,6 +60,7 @@
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>javax.transaction-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
diff --git a/jetty-plus/src/main/assembly/config.xml b/jetty-plus/src/main/assembly/config.xml
deleted file mode 100644
index 32d11e0dcd5..00000000000
--- a/jetty-plus/src/main/assembly/config.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly>
-  <id>config</id>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <scope>provided</scope>
-      <outputDirectory>lib/transactions</outputDirectory>
-      <includes>
-        <include>javax.transaction:javax.transaction-api</include>
-      </includes>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-      <directory>src/main/plus-config</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>**</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>
-
diff --git a/jetty-plus/src/main/plus-config/etc/jetty-plus.xml b/jetty-plus/src/main/config/etc/jetty-plus.xml
similarity index 100%
rename from jetty-plus/src/main/plus-config/etc/jetty-plus.xml
rename to jetty-plus/src/main/config/etc/jetty-plus.xml
diff --git a/jetty-plus/src/main/config/modules/plus.mod b/jetty-plus/src/main/config/modules/plus.mod
new file mode 100644
index 00000000000..49a909a0154
--- /dev/null
+++ b/jetty-plus/src/main/config/modules/plus.mod
@@ -0,0 +1,12 @@
+[description]
+Enables resource injection and other servlet 3.x 
+features not supported in the core jetty webapps module.
+
+[depend]
+server
+security
+jndi
+webapp
+
+[lib]
+lib/jetty-plus-${jetty.version}.jar
diff --git a/jetty-plus/src/main/plus-config/modules/plus.mod b/jetty-plus/src/main/plus-config/modules/plus.mod
deleted file mode 100644
index a6176b01cac..00000000000
--- a/jetty-plus/src/main/plus-config/modules/plus.mod
+++ /dev/null
@@ -1,14 +0,0 @@
-[description]
-Enables JNDI and resource injection for webapplications 
-and other servlet 3.x features not supported in the core
-jetty webapps module.
-
-[depend]
-server
-security
-jndi
-webapp
-transactions
-
-[lib]
-lib/jetty-plus-${jetty.version}.jar
diff --git a/jetty-plus/src/main/plus-config/modules/transactions.mod b/jetty-plus/src/main/plus-config/modules/transactions.mod
deleted file mode 100644
index 025f2cf2dec..00000000000
--- a/jetty-plus/src/main/plus-config/modules/transactions.mod
+++ /dev/null
@@ -1,8 +0,0 @@
-[description]
-Puts javax.transaction api on the classpath  
-
-[name]
-transactions
-
-[lib]
-lib/transactions/*.jar
diff --git a/tests/test-webapps/test-jndi-webapp/pom.xml b/tests/test-webapps/test-jndi-webapp/pom.xml
index 1bb9f83e79d..810aef61bce 100644
--- a/tests/test-webapps/test-jndi-webapp/pom.xml
+++ b/tests/test-webapps/test-jndi-webapp/pom.xml
@@ -51,30 +51,12 @@
           <execution>
             <phase>package</phase>
             <goals>
-              <goal>copy</goal>
+              <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.eclipse.jetty.tests</groupId>
-                  <artifactId>test-mock-resources</artifactId>
-                  <version>${project.version}</version>
-                  <type>jar</type>
-                  <includes>**</includes>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
-                </artifactItem>
-                <artifactItem>
-                  <groupId>org.eclipse.jetty.orbit</groupId>
-                  <artifactId>javax.mail.glassfish</artifactId>
-                  <version>1.4.1.v201005082020</version>
-                  <type>jar</type>
-                  <includes>**</includes>
-                  <overWrite>true</overWrite>
-                  <outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-          </configuration>
+              <includeArtifactIds>javax.transaction-api,javax.mail.glassfish,test-mock-resources</includeArtifactIds>
+              <outputDirectory>${project.build.directory}/lib/jndi</outputDirectory>
+            </configuration>
           </execution>
         </executions>
        </plugin>
@@ -109,21 +91,27 @@
           </webAppConfig>
         </configuration>
         <dependencies>
-          <dependency>
-            <groupId>org.eclipse.jetty.tests</groupId>
-            <artifactId>test-mock-resources</artifactId>
-            <version>${project.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.eclipse.jetty.orbit</groupId>
-            <artifactId>javax.mail.glassfish</artifactId>
-            <version>1.4.1.v201005082020</version>
-          </dependency>
+            <dependency>
+              <groupId>org.eclipse.jetty.tests</groupId>
+              <artifactId>test-mock-resources</artifactId>
+              <version>${project.version}</version>
+            </dependency>
+            <dependency>
+              <groupId>org.eclipse.jetty.orbit</groupId>
+              <artifactId>javax.mail.glassfish</artifactId>
+              <version>1.4.1.v201005082020</version>
+            </dependency>
         </dependencies>
       </plugin>
     </plugins>
   </build>
  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.jetty.tests</groupId>
+      <artifactId>test-mock-resources</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>javax.transaction-api</artifactId>
@@ -139,6 +127,12 @@
       <artifactId>javax.mail.glassfish</artifactId>
       <version>1.4.1.v201005082020</version>
       <scope>provided</scope>
+      <exclusions>
+       <exclusion>
+         <groupId>org.eclipse.jetty.orbit</groupId>
+         <artifactId>javax.activation</artifactId>
+       </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>
diff --git a/tests/test-webapps/test-mock-resources/pom.xml b/tests/test-webapps/test-mock-resources/pom.xml
index 78cdfc64e05..e413de23d51 100644
--- a/tests/test-webapps/test-mock-resources/pom.xml
+++ b/tests/test-webapps/test-mock-resources/pom.xml
@@ -52,17 +52,16 @@
     <dependency>
       <groupId>javax.transaction</groupId>
       <artifactId>javax.transaction-api</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.orbit</groupId>
       <artifactId>javax.mail.glassfish</artifactId>
       <version>1.4.1.v201005082020</version>
-      <scope>provided</scope>
     </dependency>
 
   </dependencies>
diff --git a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
index baf54454e9d..43cc24a6e89 100644
--- a/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
+++ b/tests/test-webapps/test-servlet-spec/test-spec-webapp/pom.xml
@@ -185,11 +185,6 @@
       <version>${project.version}</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.mail.glassfish</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
        <groupId>javax.servlet</groupId>
        <artifactId>javax.servlet-api</artifactId>