diff --git a/AMDiS/src/BoundaryManager.cc b/AMDiS/src/BoundaryManager.cc
index 67baf96eda9d0fb81ed48e89875399c70f32e0c8..7e9ca54b301265fa17cfe84eb095a2e69ea7778b 100644
--- a/AMDiS/src/BoundaryManager.cc
+++ b/AMDiS/src/BoundaryManager.cc
@@ -49,8 +49,6 @@ namespace AMDiS {
   {
     FUNCNAME("BoundaryManager::addBoundaryCondition()");
   
-    MSG("ADD BC\n");
-
     BoundaryType type = localBC->getBoundaryType();
     TEST_EXIT(localBCs[type] == NULL)
       ("There is already a condition for this type %d.\n",type);
diff --git a/AMDiS/src/io/MacroReader.cc b/AMDiS/src/io/MacroReader.cc
index b6aaaaa457cbad6867d24d3890cdb6a25c911da3..5ab776ff785d507d01a2b2504e165ad6aafd0766 100644
--- a/AMDiS/src/io/MacroReader.cc
+++ b/AMDiS/src/io/MacroReader.cc
@@ -206,20 +206,22 @@ namespace AMDiS {
 	}
       }
 
+#if (DEBUG != 0)
       std::map<BoundaryType, VertexVector*>::iterator assoc;
       std::map<BoundaryType, VertexVector*>::iterator assocEnd =
 	mesh->periodicAssociations.end();
-      for (assoc = mesh->periodicAssociations.begin(); assoc != assocEnd; ++assoc) {
+      for (assoc = mesh->periodicAssociations.begin(); 
+	   assoc != assocEnd; ++assoc)
 	for (int i = 0; i < mesh->getNumberOfVertices(); i++)
 	  if (i != (*(assoc->second))[i])
 	    MSG("association %d: vertex %d -> vertex %d\n", 
-		assoc->first, i, (*(assoc->second))[i]);	
-      }
+		assoc->first, i, (*(assoc->second))[i]);
 
       for (int i = 0; i < mesh->getNumberOfVertices(); i++)
 	if (periodicMap.getEntry(i) != -1)
 	  MSG("identification : vertex %d is now vertex %d\n", 
 	      i, periodicMap.getEntry(i));
+#endif
 
     } // periodicFile