diff --git a/BUCK b/BUCK
index 913ab47..7fd0f96 100644
--- a/BUCK
+++ b/BUCK
@@ -5,7 +5,6 @@
   '//gitiles-servlet:servlet',
   '//gitiles-servlet:src',
   '//gitiles-servlet:javadoc',
-  '//gitiles-war:gitiles',
 ]
 
 java_library(
@@ -32,7 +31,7 @@
   for d in DEPS:
     n,t = d.split(':')
     a.add(t)
-    out = "%s.%s" % (t, 'war' if 'war' in n else 'jar')
+    out = "%s.jar" % t
     genrule(
       name = t,
       cmd = 'ln -s $(location %s) $OUT' % d,
diff --git a/bucklets.defs b/bucklets.defs
index 1ba5e0c..20479b8 100644
--- a/bucklets.defs
+++ b/bucklets.defs
@@ -16,7 +16,6 @@
   'java_sources.bucklet',
   'maven_jar.bucklet',
   'maven_package.bucklet',
-  'war.bucklet',
 ]
 
 for bucklet in bucklets:
diff --git a/gitiles-war/BUCK b/gitiles-war/BUCK
deleted file mode 100644
index 268321d..0000000
--- a/gitiles-war/BUCK
+++ /dev/null
@@ -1,19 +0,0 @@
-war(
-  name = 'gitiles',
-  libs = ['//gitiles-servlet:servlet'],
-  context = [
-    '//gitiles-servlet:static-resources',
-    ':web_xml',
-  ],
-  visibility = ['PUBLIC'],
-)
-
-genrule(
-  name = 'web_xml',
-  cmd = 'mkdir -p $TMP/WEB-INF'
-    + ';cp -r $SRCDIR/src/main/webapp/WEB-INF/web.xml $TMP/WEB-INF'
-    + ';cd $TMP'
-    + ';zip -qr $OUT *',
-  srcs = ['src/main/webapp/WEB-INF/web.xml'],
-  out = 'web_xml.zip',
-)
diff --git a/gitiles-war/src/main/webapp/WEB-INF/web.xml b/gitiles-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index bffacb5..0000000
--- a/gitiles-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-<!--
-  Copyright 2012 Google Inc. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<web-app>
-  <display-name>Gitiles</display-name>
-
-  <servlet>
-    <servlet-name>gitiles</servlet-name>
-    <servlet-class>com.google.gitiles.GitilesServlet</servlet-class>
-    <init-param>
-      <param-name>configPath</param-name>
-      <param-value>gitiles.config</param-value>
-    </init-param>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>/+static/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>gitiles</servlet-name>
-    <url-pattern>/*</url-pattern>
-  </servlet-mapping>
-</web-app>
diff --git a/gitiles-war/webdefault.xml b/gitiles-war/webdefault.xml
deleted file mode 100644
index 8eaddc4..0000000
--- a/gitiles-war/webdefault.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE web-app PUBLIC
- "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd" >
-<!--
-  Copyright 2012 Google Inc. All Rights Reserved.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<web-app>
-  <servlet>
-    <servlet-name>default</servlet-name>
-    <servlet-class>org.eclipse.jetty.servlet.DefaultServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>/+static/*</url-pattern>
-  </servlet-mapping>
-</web-app>