diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
index 067d94320f27caad285ec01635e8bfab018c12be..6b9b1767d5f800c076962b077f046dc729a6eee5 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -82,7 +82,7 @@ public abstract class RecordListDelivererAbstract implements RecordListDeliverer
 
     // FIXME Avoid useless logging!
 
-    log.debug("RANGEFIELD: " + "created");
+    System.out.println("RANGEFIELD: " + "created");
 
     QueryBuilder rangeQuery = QueryBuilders.rangeQuery("created").from(from).to(to);
     QueryBuilder filterSandBox = QueryBuilders.matchPhraseQuery("nearlyPublished", "true");
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
index b35d05305dcf85ef886c3b2ec2ec1e0a8ebcba12..80e0515c4e38645f0fd962a11965c7b5540a01b1 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDATACITE.java
@@ -43,19 +43,14 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
 
     if (this.textgrid) {
       for (String uri : getUriList(from, to, set, resumptionToken)) {
+
+        System.out.println("  ##  URI: " + uri);
+
         try {
-          try {
-            openAireRecord = new RecordDelivererDATACITE(true, false);
-            GetRecordType grt = openAireRecord.getRecordById(uri.replace("textgrid:", ""));
-            openAireRecordList.getRecord().add(grt.getRecord());
-          } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-          }
-        } catch (ParseException e) {
-          // TODO Auto-generated catch block
-          e.printStackTrace();
-        } catch (DatatypeConfigurationException e) {
+          openAireRecord = new RecordDelivererDATACITE(true, false);
+          GetRecordType grt = openAireRecord.getRecordById(uri.replace("textgrid:", ""));
+          openAireRecordList.getRecord().add(grt.getRecord());
+        } catch (ParseException | DatatypeConfigurationException | IOException e) {
           // TODO Auto-generated catch block
           e.printStackTrace();
         }
@@ -74,20 +69,12 @@ public class RecordListDelivererDATACITE extends RecordListDelivererAbstract {
         System.out.println("  ##  URI: " + uri);
 
         try {
-          try {
-            openAireRecord = new RecordDelivererDATACITE(true, false);
-            // We must remove the prefix, as ElasticSearch is storing the IDa without it.
-            GetRecordType grt =
-                openAireRecord.getRecordById(uri.replace(RDFConstants.HDL_PREFIX, ""));
-            openAireRecordList.getRecord().add(grt.getRecord());
-          } catch (IOException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-          }
-        } catch (ParseException e) {
-          // TODO Auto-generated catch block
-          e.printStackTrace();
-        } catch (DatatypeConfigurationException e) {
+          openAireRecord = new RecordDelivererDATACITE(true, false);
+          // We must remove the prefix, as ElasticSearch is storing the IDa without it.
+          GetRecordType grt =
+              openAireRecord.getRecordById(uri.replace(RDFConstants.HDL_PREFIX, ""));
+          openAireRecordList.getRecord().add(grt.getRecord());
+        } catch (ParseException | DatatypeConfigurationException | IOException e) {
           // TODO Auto-generated catch block
           e.printStackTrace();
         }