diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
index f1c719714ec82614f734ea84d3e85e2dfc3884ab..14fc98786b7b2c0ba8dd1ffec45041463a788d99 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreFieldLoader.java
@@ -34,7 +34,7 @@ public class DublinCoreFieldLoader {
   private static org.apache.commons.logging.Log log = LogFactory.getLog(OAIPMHImpl.class);
 
   /**
-   * This function takes the results of the ElasticSearch resuest and fills the String-Lists with
+   * This function takes the results of the ElasticSearch request and fills the String-Lists with
    * the specific values for the dublin core field
    * 
    * @param responseOfGetRequest result of the ElasticSearch request from a getRequest (Single
@@ -163,6 +163,7 @@ public class DublinCoreFieldLoader {
   // return fillList(hit, fields, "");
   // }
 
+  // TODO Remove method, I just tried to fix things, we do another way now! --fu
   // /**
   // * @param hit
   // * @param fields
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
index 345108e1f1649c53cd4aaf04ebca93f752397d9d..3e37efdc4a782a24b82445a30911f60aeb702555 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
@@ -174,7 +174,6 @@ public class IdentifierListDelivererDC extends IdentifierListDelivererAbstract {
 
       // Handle TextGrid.
       if (this.textgrid) {
-        // hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
         String datestamp = hit.getSourceAsMap().get(this.dateOfObjectCreation).toString();
         try {
           datestamp = OAIPMHUtilities.convertDateFormat(datestamp).toXMLFormat();
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
index 99a8b99dbef439cf8c95c9a0459952fb6215fe24..4cced81ac7e27c76ac76539941715d1058900363 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -267,16 +267,9 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
 
             // Get identifier field.
             String identifier = OAIPMHUtilities.fieldLoader(json, this.identifierField);
-
-            // List<String> identifierList =
-            // DublinCoreFieldLoader.fillList(hit, DARIAHConstants.IDENTIFIER_LIST, "hdl:");
-
-            // System.out.println("identifierList: " + identifierList);
-
-            // String setSpec = identifierList.get(0);
-
             String setSpec = identifier;
 
+            System.out.println("identifier: " + identifier);
             System.out.println("setSpec: " + setSpec);
 
             try {
@@ -290,19 +283,6 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
               e.printStackTrace();
             }
 
-            System.out.println("v. recordList: " + (recordList == null ? "NULL" : recordList));
-            System.out.println("v. set: " + (set == null ? "NULL" : set));
-            System.out.println("v. dublinCoreBuilder: "
-                + (dublinCoreBuilder == null ? "NULL" : dublinCoreBuilder));
-            System.out.println("v. setSpec: " + (setSpec == null ? "NULL" : setSpec));
-            // System.out.println("v. hit.krams: "
-            // + (hit.getSourceAsMap().get(this.identifierField).toString() == null ? "NULL"
-            // : hit.getSourceAsMap().get(this.identifierField).toString()));
-
-            // buildRecord(recordList, set,
-            // hit.getSourceAsMap().get(this.identifierField).toString(),
-            // dublinCoreBuilder, setSpec);
-
             buildRecord(recordList, set, identifier, dublinCoreBuilder, setSpec);
           }
         }
@@ -403,6 +383,8 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
     MetadataType metadata = new MetadataType();
     RecordType record = new RecordType();
 
+    System.out.println("headerIdentifier: " + headerIdentifier);
+
     metadata = dublinCoreBuilder.getDC();
     record.setMetadata(metadata);
     record.setHeader(setHeader(set, headerIdentifier, setSpec));
@@ -455,11 +437,11 @@ public class RecordListDelivererDC extends RecordListDelivererAbstract {
     }
     try {
 
-      System.out.println("  ##  getRecords()  -->  "
-          + (query != null ? "queryName=" + query.getName() : "query=NULL") + " | "
-          + (recordList != null ? recordList : "recordList=NULL") + " | "
-          + (resumptionToken != null ? resumptionToken : "resumptionToken=NULL") + " | "
-          + (set != null ? set : "set=NULL"));
+      // System.out.println(" ## getRecords() --> "
+      // + (query != null ? "queryName=" + query.getName() : "query=NULL") + " | "
+      // + (recordList != null ? recordList : "recordList=NULL") + " | "
+      // + (resumptionToken != null ? resumptionToken : "resumptionToken=NULL") + " | "
+      // + (set != null ? set : "set=NULL"));
 
       fetchFields(query, recordList, resumptionToken, set);