diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/web.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/web.xml
index e611c6fa42cdab47acf1f21138e116f698b06f15..75282d840959c29d6e4e035b4626ad84be2003cf 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/web.xml
@@ -1,73 +1,32 @@
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-	      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	      version="2.5">	
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
+	      http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5">
 
 	<display-name>oaipmh-webapp</display-name>
-	
+
 	<!-- OAIPMH Configuration -->
-	<!-- <context-param> -->
-	<!-- <param-name>log4jConfigLocation</param-name> -->
-	<!-- <param-value>file:/etc/textgrid/tgoaipmh/log4j.properties</param-value> -->
-	<!-- </context-param> -->
-	
 	<context-param>
 		<param-name>contextConfigLocation</param-name>
 		<param-value>WEB-INF/beans.xml</param-value>
 	</context-param>
-	
+
 	<context-param>
-      <param-name>log4jExposeWebAppRoot</param-name>
-      <param-value>false</param-value>
-    </context-param>
-	
-	<!-- Listener classes -->	
-<!--
-    <listener>
-		<listener-class>org.springframework.web.util.Log4jConfigListener</listener-class>
+		<param-name>log4jExposeWebAppRoot</param-name>
+		<param-value>false</param-value>
+	</context-param>
+
+	<!-- Listener classes -->
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 	</listener>
--->
-	
-	 <listener>
-	 	<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-	 </listener>
-	 
-	 <servlet>
+
+	<servlet>
 		<servlet-name>CXFServlet</servlet-name>
-		<servlet-class>
-			org.apache.cxf.transport.servlet.CXFServlet
-        </servlet-class>
+		<servlet-class>org.apache.cxf.transport.servlet.CXFServlet</servlet-class>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
-	 
+
 	<servlet-mapping>
 		<servlet-name>CXFServlet</servlet-name>
 		<url-pattern>/*</url-pattern>
 	</servlet-mapping>
-	 
-	<!--  
-	<servlet>
-		<servlet-name>mvc-dispatcher</servlet-name>
-		<servlet-class>
-			org.springframework.web.servlet.DispatcherServlet
-		</servlet-class>
-		<load-on-startup>1</load-on-startup>
-	</servlet>
- 
-	<servlet-mapping>
-		<servlet-name>mvc-dispatcher</servlet-name>
-		<url-pattern>/</url-pattern>
-	</servlet-mapping>
- 
-	<context-param>
-		<param-name>contextConfigLocation</param-name>
-		<param-value>/WEB-INF/mvc-dispatcher-servlet.xml</param-value>
-	</context-param>
- 
-	<listener>
-		<listener-class>
-			org.springframework.web.context.ContextLoaderListener
-		</listener-class>
-	</listener>  -->
 </web-app>