diff --git a/README.md b/README.md
index 6343e3876..e7ac24553 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Running from Source Code
 ========================
 
 As webapp js is in dev and won't probably be released soon, the module is not activated by default and it's included only in a profile
-mvn tomcat7:run -pl :archiva-webapp -am  (to save fingers :-) use sh ./t7.sh ) (debug with sh ./t7-debug.sh  port 8000)
+mvn jetty:run -pl :archiva-webapp -am  (to save fingers :-) use sh ./jetty.sh ) (debug with sh ./jetty-debug.sh debug port 8000)
 
 
 hit your browser: http://localhost:9091/archiva/index.html
@@ -49,7 +49,7 @@ This file must contains:
 Using with cassandra as metadata storage
 ========================
 You can run the application using cassandra as storage.
-sh ./t7.sh -Pcassandra
+sh ./jetty.sh -Pcassandra
 
 Default cassandra host is localhost and port 9160
 
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 1b203dd7f..1d3c53ed1 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -30,7 +30,6 @@
   <name>Archiva Web :: Javascript Application</name>
 
   <properties>
-    <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
     <archiva.devMode>true</archiva.devMode>
     <archiva.javascriptLog>true</archiva.javascriptLog>
     <archiva.logMissingI18n>true</archiva.logMissingI18n>
@@ -38,7 +37,6 @@
     <jettyDumpOnStart>false</jettyDumpOnStart>
     <archiva.baseRestUrl />
     <rest.admin.pwd />
-    <test.useTomcat>false</test.useTomcat>
     <archiva.groupIndexTtl>30</archiva.groupIndexTtl>
     <archiva.repositorySessionFactory.id>jcr</archiva.repositorySessionFactory.id>
     <cassandra.host>localhost</cassandra.host>
@@ -1079,7 +1077,6 @@
             <derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
             <archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
             <rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
-            <test.useTomcat>${test.useTomcat}</test.useTomcat>
             <redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
             <redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
           </systemPropertyVariables>
diff --git a/pom.xml b/pom.xml
index 7fc5386c5..b78f61ef2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,6 @@
     <plexus-digest.version>1.1</plexus-digest.version>
     <plexus-expression-evaluator.version>2.1</plexus-expression-evaluator.version>
     <plexus-utils.version>3.0.15</plexus-utils.version>
-    <asfTomcatMavenPluginVersion>2.2</asfTomcatMavenPluginVersion>
     <tomcat7Version>7.0.54</tomcat7Version>
     <htmlUnitVersion>2.27</htmlUnitVersion>
 
@@ -1583,115 +1582,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-core</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-util</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-coyote</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-api</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jdbc</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-dbcp</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-servlet-api</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jsp-api</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jasper</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-jasper-el</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-el-api</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-tribes</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-catalina-ha</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-annotations-api</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat</groupId>
-            <artifactId>tomcat-juli</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-
-          <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-logging-juli</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.apache.tomcat.embed</groupId>
-            <artifactId>tomcat-embed-logging-log4j</artifactId>
-            <version>${tomcat7Version}</version>
-          </dependency>
-        </dependencies>
-       </plugin>
     </plugins>
     <pluginManagement>
       <plugins>
@@ -1746,11 +1636,6 @@
             </systemPropertyVariables>
           </configuration>
         </plugin>
-        <plugin>
-          <groupId>org.apache.tomcat.maven</groupId>
-          <artifactId>tomcat7-maven-plugin</artifactId>
-          <version>${asfTomcatMavenPluginVersion}</version>
-        </plugin>
         <plugin>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-maven-plugin</artifactId>
diff --git a/t7-debug.sh b/t7-debug.sh
deleted file mode 100644
index 40e39724a..000000000
--- a/t7-debug.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-set -x
-mvnDebug tomcat7:run -pl :archiva-webapp -am  $@
diff --git a/t7.sh b/t7.sh
deleted file mode 100644
index de6224b53..000000000
--- a/t7.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-set -x
-mvn tomcat7:run -pl :archiva-webapp -am  $@