diff --git a/Model/pom.xml b/Model/pom.xml
index c216d7981..01a23cfca 100644
--- a/Model/pom.xml
+++ b/Model/pom.xml
@@ -91,7 +91,7 @@
 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
     </dependency>
 
     <dependency>
diff --git a/Service/pom.xml b/Service/pom.xml
index adf94e8c9..4a255eced 100644
--- a/Service/pom.xml
+++ b/Service/pom.xml
@@ -72,7 +72,7 @@
 
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>provided</scope>
     </dependency>
 
@@ -86,11 +86,6 @@
       <artifactId>jersey-media-multipart</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.glassfish.jersey.core</groupId>
-      <artifactId>jersey-server</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
diff --git a/Site/webapp/WEB-INF/web.xml b/Site/webapp/WEB-INF/web.xml
index aa5ab0d6c..3f5280146 100644
--- a/Site/webapp/WEB-INF/web.xml
+++ b/Site/webapp/WEB-INF/web.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="2.4"
-    xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:web="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+<web-app version="4.0"
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
 
   <context-param>
     <param-name>GUS_HOME</param-name>
@@ -16,10 +15,6 @@
     <param-value>/service</param-value>
   </context-param>
 
-  <listener>
-    <listener-class>se.jiderhamn.classloader.leak.prevention.ClassLoaderLeakPreventorListener</listener-class>
-  </listener>
-
   <listener>
     <listener-class>org.apidb.apicommon.controller.ApplicationInitListener</listener-class>
   </listener>
diff --git a/build.xml b/build.xml
index 6d85c830c..fcffe3690 100644
--- a/build.xml
+++ b/build.xml
@@ -5,7 +5,6 @@
   <!-- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -->
 
   <import file="${projectsDir}/EbrcWebSvcCommon/build.xml" />
-  <import file="${projectsDir}/JBrowse/build.xml" />
   <import file="${projectsDir}/ApiCommonModel/build.xml" />
 
   <!-- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -->
@@ -14,7 +13,6 @@
 
   <target name="ApiCommonWebsite-Installation" depends="EbrcWebSvcCommon-Installation,
                                                         ApiCommonModel-Installation,
-                                                        JBrowse-Installation,
                                                         ApiCommonWebsite/Model-Installation,
                                                         ApiCommonWebsite/View-Installation,
                                                         ApiCommonWebsite/Site-Installation,
@@ -88,7 +86,6 @@
   <!-- oooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo -->
 
   <target name="ApiCommonWebsite-WebInstallation" depends="EbrcWebSvcCommon-WebInstallation,
-                                                           JBrowse-WebInstallation,
                                                            ApiCommonWebsite-Installation,
                                                            ApiCommonWebsite/View-WebInstallation,
                                                            ApiCommonWebsite/Site-WebInstallation">