Index: src/uk/me/parabola/imgfmt/app/net/RouteArc.java
===================================================================
--- src/uk/me/parabola/imgfmt/app/net/RouteArc.java	(revision 4615)
+++ src/uk/me/parabola/imgfmt/app/net/RouteArc.java	(working copy)
@@ -321,8 +321,6 @@
 			} else {
 				writer.put(directionFromDegrees(initialHeading));
 			}
-		} else {
-//			System.out.println("skipped writing of initial dir");
 		}
 		if (haveCurve) {
 			int[] curvedat = encodeCurve();
Index: src/uk/me/parabola/imgfmt/app/trergn/ExtTypeAttributes.java
===================================================================
--- src/uk/me/parabola/imgfmt/app/trergn/ExtTypeAttributes.java	(revision 4615)
+++ src/uk/me/parabola/imgfmt/app/trergn/ExtTypeAttributes.java	(working copy)
@@ -1115,8 +1115,6 @@
 				range = Double.parseDouble(parts[1]);
 			if(parts.length > 2)
 				angle = Double.parseDouble(parts[2]);
-
-			//System.err.println("light = " + this);
 		}
 
 		public String toString() {
Index: src/uk/me/parabola/imgfmt/app/typ/TypElement.java
===================================================================
--- src/uk/me/parabola/imgfmt/app/typ/TypElement.java	(revision 4615)
+++ src/uk/me/parabola/imgfmt/app/typ/TypElement.java	(working copy)
@@ -136,7 +136,6 @@
 			} catch (CharacterCodingException ignore) {
 				//ignore.printStackTrace();
 				String name = encoder.charset().name();
-				//System.out.println("cs " + name);
 				log.warn("Cannot represent String", tl.getText(), "for language", tl.getLang(), "in CodePage", name);
 				//throw new TypLabelException(name);
 			}
Index: src/uk/me/parabola/imgfmt/sys/ImgHeader.java
===================================================================
--- src/uk/me/parabola/imgfmt/sys/ImgHeader.java	(revision 4615)
+++ src/uk/me/parabola/imgfmt/sys/ImgHeader.java	(working copy)
@@ -188,7 +188,6 @@
 	 */
 	private void writeSizeValues(int blockSize) {
 		int endSector = (int) (((numBlocks+1L) * blockSize + 511) / 512);
-		//System.out.printf("end sector %d %x\n", endSector, endSector);
 
 		// We have three maximum values for sectors, heads and cylinders.  We attempt to find values
 		// for them that are larger than the 
@@ -205,7 +204,6 @@
 			for (int s : asList(4, 8, 16, 32)) {
 				for (int c : asList(0x20, 0x40, 0x80, 0x100, 0x200, 0x3ff)) {
 					log.info("shc=", s + "," + h + "," + c, "end=", endSector);
-					//System.out.println("shc=" + s + "," + h + "," + c + "end=" + endSector);
 					if (s * h * c > endSector) {
 						headsPerCylinder = h;
 						sectorsPerTrack = s;
Index: src/uk/me/parabola/mkgmap/build/Locator.java
===================================================================
--- src/uk/me/parabola/mkgmap/build/Locator.java	(revision 4615)
+++ src/uk/me/parabola/mkgmap/build/Locator.java	(working copy)
@@ -187,8 +187,6 @@
 		{	
 			String[] cityList = p.getIsIn().split(",");
 			
-			//System.out.println(p.getIsIn());
-
 			// is_in content is not well defined so we try our best to get some info out of it
 			// Format 1 popular in Germany: "County,State,Country,Continent"