diff --git a/oaipmh-core/.classpath b/oaipmh-core/.classpath
index 34f0799ffebd36da6412b7de4889b61f88b2a590..3190a0209c7f8a758dca177908066051ef81e4fa 100644
--- a/oaipmh-core/.classpath
+++ b/oaipmh-core/.classpath
@@ -231,61 +231,6 @@
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-runtime/2.5.0/sesame-runtime-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-model/2.5.0/sesame-model-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-collections/2.8.0/aduna-commons-collections-2.8.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-concurrent/2.7.0/aduna-commons-concurrent-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-io/2.10.0/aduna-commons-io-2.10.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-i18n/1.4.0/aduna-commons-i18n-1.4.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-query/2.5.0/sesame-query-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-api/2.5.0/sesame-rio-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-lang/2.9.0/aduna-commons-lang-2.9.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-net/2.7.0/aduna-commons-net-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-text/2.7.0/aduna-commons-text-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-iteration/2.10.0/aduna-commons-iteration-2.10.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-model/2.5.0/sesame-queryalgebra-model-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-api/2.5.0/sesame-queryparser-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-serql/2.5.0/sesame-queryparser-serql-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-sparql/2.5.0/sesame-queryparser-sparql-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-api/2.5.0/sesame-queryresultio-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-binary/2.5.0/sesame-queryresultio-binary-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqljson/2.5.0/sesame-queryresultio-sparqljson-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqlxml/2.5.0/sesame-queryresultio-sparqlxml-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-xml/2.7.0/aduna-commons-xml-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-text/2.5.0/sesame-queryresultio-text-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-api/2.5.0/sesame-repository-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-manager/2.5.0/sesame-repository-manager-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-event/2.5.0/sesame-repository-event-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-sail/2.5.0/sesame-repository-sail-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-api/2.5.0/sesame-sail-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-memory/2.5.0/sesame-sail-memory-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-inferencer/2.5.0/sesame-sail-inferencer-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-evaluation/2.5.0/sesame-queryalgebra-evaluation-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-http/2.5.0/sesame-repository-http-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-http-client/2.5.0/sesame-http-client-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-http-protocol/2.5.0/sesame-http-protocol-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-ntriples/2.5.0/sesame-rio-ntriples-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-dataset/2.5.0/sesame-repository-dataset-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-contextaware/2.5.0/sesame-repository-contextaware-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-binary/2.5.0/sesame-rio-binary-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-n3/2.5.0/sesame-rio-n3-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-turtle/2.5.0/sesame-rio-turtle-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-rdfxml/2.5.0/sesame-rio-rdfxml-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-trix/2.5.0/sesame-rio-trix-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-trig/2.5.0/sesame-rio-trig-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-nativerdf/2.5.0/sesame-sail-nativerdf-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-rdbms/2.5.0/sesame-sail-rdbms-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar" sourcepath="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-sources.jar">
     <attributes>
       <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" name="javadoc_location"/>
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index c47d82902796b8844438941a612898ba67daeb40..d7da70f34e792d4f29b416985eb374a7423844bc 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -81,11 +81,11 @@
 			<version>${textgrid.httpclients.version}</version>
 		</dependency>
 	
-		<dependency>
+		<!-- >dependency>
 			<groupId>org.openrdf.sesame</groupId>
 			<artifactId>sesame-runtime</artifactId>
 			<version>2.5.0</version>
-		</dependency>
+		</dependency-->
     
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -124,11 +124,11 @@
 			</snapshots>
 		</repository>
 		
-		<repository>
+		<!-- repository>
         	<id>aduna</id>
         	<name>Aduna Software</name>
         	<url>http://repo.aduna-software.org/maven2/releases/</url>
-      	</repository>
+      	</repository-->
 	</repositories>
 	
   <build>
diff --git a/oaipmh-webapp/.classpath b/oaipmh-webapp/.classpath
index f8462cfb98bfd488cd1c2f7c122ab0dbeaa3fa9a..c361ad0ad9bc51ddf940abe6cd4d2df5f8f08611 100644
--- a/oaipmh-webapp/.classpath
+++ b/oaipmh-webapp/.classpath
@@ -245,61 +245,6 @@
     </attributes>
   </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpmime/4.2.1/httpmime-4.2.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-runtime/2.5.0/sesame-runtime-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-model/2.5.0/sesame-model-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-collections/2.8.0/aduna-commons-collections-2.8.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-concurrent/2.7.0/aduna-commons-concurrent-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-io/2.10.0/aduna-commons-io-2.10.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-i18n/1.4.0/aduna-commons-i18n-1.4.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-query/2.5.0/sesame-query-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-api/2.5.0/sesame-rio-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-lang/2.9.0/aduna-commons-lang-2.9.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-net/2.7.0/aduna-commons-net-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-text/2.7.0/aduna-commons-text-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-iteration/2.10.0/aduna-commons-iteration-2.10.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-model/2.5.0/sesame-queryalgebra-model-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-api/2.5.0/sesame-queryparser-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-serql/2.5.0/sesame-queryparser-serql-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryparser-sparql/2.5.0/sesame-queryparser-sparql-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-api/2.5.0/sesame-queryresultio-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-binary/2.5.0/sesame-queryresultio-binary-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqljson/2.5.0/sesame-queryresultio-sparqljson-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-sparqlxml/2.5.0/sesame-queryresultio-sparqlxml-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/info/aduna/commons/aduna-commons-xml/2.7.0/aduna-commons-xml-2.7.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryresultio-text/2.5.0/sesame-queryresultio-text-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-api/2.5.0/sesame-repository-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-manager/2.5.0/sesame-repository-manager-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-event/2.5.0/sesame-repository-event-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-sail/2.5.0/sesame-repository-sail-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-api/2.5.0/sesame-sail-api-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-memory/2.5.0/sesame-sail-memory-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-inferencer/2.5.0/sesame-sail-inferencer-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-queryalgebra-evaluation/2.5.0/sesame-queryalgebra-evaluation-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-http/2.5.0/sesame-repository-http-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-http-client/2.5.0/sesame-http-client-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-http-protocol/2.5.0/sesame-http-protocol-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-ntriples/2.5.0/sesame-rio-ntriples-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar" sourcepath="M2_REPO/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-dataset/2.5.0/sesame-repository-dataset-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-repository-contextaware/2.5.0/sesame-repository-contextaware-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-binary/2.5.0/sesame-rio-binary-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-n3/2.5.0/sesame-rio-n3-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-turtle/2.5.0/sesame-rio-turtle-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-rdfxml/2.5.0/sesame-rio-rdfxml-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-trix/2.5.0/sesame-rio-trix-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-rio-trig/2.5.0/sesame-rio-trig-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-nativerdf/2.5.0/sesame-sail-nativerdf-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/openrdf/sesame/sesame-sail-rdbms/2.5.0/sesame-sail-rdbms-2.5.0.jar"/>
-  <classpathentry kind="var" path="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3.jar" sourcepath="M2_REPO/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-dbcp/commons-dbcp/1.3/commons-dbcp-1.3-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
-  <classpathentry kind="var" path="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4.jar" sourcepath="M2_REPO/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-sources.jar">
-    <attributes>
-      <attribute value="jar:file:/home/max/.m2/repository/commons-pool/commons-pool/1.5.4/commons-pool-1.5.4-javadoc.jar!/" name="javadoc_location"/>
-    </attributes>
-  </classpathentry>
   <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-sources.jar">
     <attributes>
       <attribute value="jar:file:/home/max/.m2/repository/org/slf4j/jcl-over-slf4j/1.7.5/jcl-over-slf4j-1.7.5-javadoc.jar!/" name="javadoc_location"/>