diff --git a/src/main/java/de/ids_mannheim/korap/query/spans/RelationSpansWithVariable.java b/src/main/java/de/ids_mannheim/korap/query/spans/RelationSpansWithVariable.java
index 4c661da..88595d4 100644
--- a/src/main/java/de/ids_mannheim/korap/query/spans/RelationSpansWithVariable.java
+++ b/src/main/java/de/ids_mannheim/korap/query/spans/RelationSpansWithVariable.java
@@ -109,15 +109,15 @@
 		while (hasMoreSecondSpans && i < temp.size()){
 			r = temp.get(i);
 			if (matchRight){
-				System.out.println(i+" "+r.getStart()+","+r.getEnd()+" "+
-						r.getRightStart()+","+r.getRightEnd()+
-						" "+secondSpans.start()+","+secondSpans.end());
+				//System.out.println(i+" "+r.getStart()+","+r.getEnd()+" "+
+				//		r.getRightStart()+","+r.getRightEnd()+
+				//		" "+secondSpans.start()+","+secondSpans.end());
 				i = matchRelation(i, r,r.getRightStart(), r.getRightEnd());
 			}
 			else{
-				System.out.println(i+" "+r.getStart()+","+r.getEnd()+" "+
-						r.getRightStart()+","+r.getRightEnd()+" "
-						+secondSpans.start()+","+secondSpans.end());
+				//System.out.println(i+" "+r.getStart()+","+r.getEnd()+" "+
+				//		r.getRightStart()+","+r.getRightEnd()+" "
+				//		+secondSpans.start()+","+secondSpans.end());
 				i = matchRelation(i, r,r.getStart(), r.getEnd());
 			}			
 		}
diff --git a/src/test/java/de/ids_mannheim/korap/index/TestRelationIndex.java b/src/test/java/de/ids_mannheim/korap/index/TestRelationIndex.java
index 2cc7044..4388fde 100644
--- a/src/test/java/de/ids_mannheim/korap/index/TestRelationIndex.java
+++ b/src/test/java/de/ids_mannheim/korap/index/TestRelationIndex.java
@@ -367,10 +367,10 @@
 				false, true);
 		kr = ki.search(rv,(short) 10);
 		
-		for (KorapMatch km : kr.getMatches()){
+		/*for (KorapMatch km : kr.getMatches()){
 			System.out.println(km.getStartPos() +","+km.getEndPos()+" "
 				+km.getSnippetBrackets());
-			}
+			}*/
 		
 		assertEquals(7, kr.getTotalResults());
 		assertEquals(0,kr.getMatch(0).getStartPos());
@@ -408,10 +408,10 @@
 				true, true);
 		kr = ki.search(rv,(short) 10);
 		
-		for (KorapMatch km : kr.getMatches()){
+		/*for (KorapMatch km : kr.getMatches()){
 			System.out.println(km.getStartPos() +","+km.getEndPos()+" "
 				+km.getSnippetBrackets());
-			}
+			}*/
 		assertEquals(4, kr.getTotalResults());
 		assertEquals(0,kr.getMatch(0).getStartPos());
 		assertEquals(7,kr.getMatch(0).getEndPos());
@@ -440,10 +440,10 @@
 				new SpanElementQuery("base","np"), 
 				false, true);
 		kr = ki.search(rv,(short) 10);
-		for (KorapMatch km : kr.getMatches()){
+		/*for (KorapMatch km : kr.getMatches()){
 			System.out.println(km.getStartPos() +","+km.getEndPos()+" "
 				+km.getSnippetBrackets());
-			}
+			}*/
 		assertEquals(4, kr.getTotalResults());
 		assertEquals(0,kr.getMatch(0).getStartPos());
 		assertEquals(7,kr.getMatch(0).getEndPos());
