diff --git a/apache-jsp/pom.xml b/apache-jsp/pom.xml
index 460dd96a1cc..7bc846eb24f 100644
--- a/apache-jsp/pom.xml
+++ b/apache-jsp/pom.xml
@@ -80,12 +80,6 @@
       <groupId>org.mortbay.jasper</groupId>
       <artifactId>apache-jsp</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-annotations</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-servlet</artifactId>
diff --git a/jetty-jndi/pom.xml b/jetty-jndi/pom.xml
index 7caf00bf284..7bbd856a06b 100644
--- a/jetty-jndi/pom.xml
+++ b/jetty-jndi/pom.xml
@@ -60,14 +60,19 @@
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-webapp</artifactId>
+      <artifactId>jetty-server</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-security</artifactId>
       <version>${project.version}</version>
       <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>
       <exclusions>
         <exclusion>
diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index 94a4a4b2843..17d4dc26586 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -80,13 +80,6 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty</groupId>
-      <artifactId>jetty-jmx</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-slf4j-impl</artifactId>
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java
index c4ea95f41a8..a635445bae4 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JaasConfiguration.java
@@ -13,8 +13,6 @@
 
 package org.eclipse.jetty.webapp;
 
-import java.util.ServiceLoader;
-
 import org.eclipse.jetty.util.Loader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,9 +22,7 @@ import org.slf4j.LoggerFactory;
  * <p>This configuration configures the WebAppContext server/system classes to
  * be able to see the org.eclipse.jetty.jaas package.
  * This class is defined in the webapp package, as it implements the {@link Configuration} interface,
- * which is unknown to the jaas package.  However, the corresponding {@link ServiceLoader}
- * resource is defined in the jaas package, so that this configuration only be
- * loaded if the jetty-jaas jars are on the classpath.
+ * which is unknown to the jaas package.
  * </p>
  */
 public class JaasConfiguration extends AbstractConfiguration
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java
index aba74957f58..7dccaaea820 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JettyWebXmlConfiguration.java
@@ -24,7 +24,7 @@ import org.slf4j.LoggerFactory;
 /**
  * JettyWebConfiguration.
  *
- * Looks for XmlConfiguration files in WEB-INF.  Searches in order for the first of jetty6-web.xml, jetty-web.xml or web-jetty.xml
+ * Looks for XmlConfiguration files in WEB-INF.  Searches in order for the first of jetty8-web.xml, jetty-web.xml or web-jetty.xml
  */
 public class JettyWebXmlConfiguration extends AbstractConfiguration
 {
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java
index 2eebbbebad6..ed9cef8fd59 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JmxConfiguration.java
@@ -13,8 +13,6 @@
 
 package org.eclipse.jetty.webapp;
 
-import java.util.ServiceLoader;
-
 import org.eclipse.jetty.util.Loader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,9 +22,7 @@ import org.slf4j.LoggerFactory;
  * <p>This configuration configures the WebAppContext server/system classes to
  * be able to see the org.eclipse.jetty.jmx package.   This class is defined
  * in the webapp package, as it implements the {@link Configuration} interface,
- * which is unknown to the jmx package.  However, the corresponding {@link ServiceLoader}
- * resource is defined in the jmx package, so that this configuration only be
- * loaded if the jetty-jmx jars are on the classpath.
+ * which is unknown to the jmx package.
  * </p>
  */
 public class JmxConfiguration extends AbstractConfiguration
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java
index 5c446b1b209..2de34e0c6ff 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JndiConfiguration.java
@@ -13,8 +13,6 @@
 
 package org.eclipse.jetty.webapp;
 
-import java.util.ServiceLoader;
-
 import org.eclipse.jetty.util.Loader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,9 +22,7 @@ import org.slf4j.LoggerFactory;
  * <p>This configuration configures the WebAppContext system/server classes to
  * be able to see the org.eclipse.jetty.jaas package.
  * This class is defined in the webapp package, as it implements the {@link Configuration} interface,
- * which is unknown to the jndi package.  However, the corresponding {@link ServiceLoader}
- * resource is defined in the jndi package, so that this configuration only be
- * loaded if the jetty-jndi jars are on the classpath.
+ * which is unknown to the jndi package.
  * </p>
  */
 public class JndiConfiguration extends AbstractConfiguration
diff --git a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java
index 12333f5bbd1..dd6d1e3cb6c 100644
--- a/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java
+++ b/jetty-webapp/src/main/java/org/eclipse/jetty/webapp/JspConfiguration.java
@@ -13,8 +13,6 @@
 
 package org.eclipse.jetty.webapp;
 
-import java.util.ServiceLoader;
-
 import org.eclipse.jetty.util.Loader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -24,9 +22,7 @@ import org.slf4j.LoggerFactory;
  * <p>This configuration configures the WebAppContext server/system classes to
  * be able to see the org.eclipse.jetty.jsp and org.eclipse.jetty.apache packages.
  * This class is defined in the webapp package, as it implements the {@link Configuration} interface,
- * which is unknown to the jsp package.  However, the corresponding {@link ServiceLoader}
- * resource is defined in the jsp package, so that this configuration only be
- * loaded if the jetty-jsp jars are on the classpath.
+ * which is unknown to the jsp package.
  * </p>
  */
 public class JspConfiguration extends AbstractConfiguration