diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml
index 7d9997b3a..c1f155a78 100644
--- a/apps/BOB/nbproject/private/private.xml
+++ b/apps/BOB/nbproject/private/private.xml
@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
-        <file>file:/root/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/BOB.java</file>
-        <file>file:/root/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/DoCMDS.java</file>
-        <file>file:/root/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/MUXlisten.java</file>
-    </open-files>
 </project-private>
diff --git a/apps/BOB/src/net/i2p/BOB/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
index 78aff0bc0..455a6b5ee 100644
--- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java
+++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
@@ -269,27 +269,27 @@ public class MUXlisten implements Runnable {
 			// Wait around till all threads are collected.
 			if (tg != null) {
 				String boner = tg.getName();
-				System.out.println("BOB: MUXlisten: Starting thread collection for: " + boner);
+				// System.out.println("BOB: MUXlisten: Starting thread collection for: " + boner);
 				_log.warn("BOB: MUXlisten: Starting thread collection for: " + boner);
 				// tg.interrupt(); // give my stuff a small smack again.
 				if (tg.activeCount() + tg.activeGroupCount() != 0) {
 					visit(tg, 0, boner);
 					int foo = tg.activeCount() + tg.activeGroupCount();
 					// hopefully no longer needed!
-					int bar = foo;
-					System.out.println("BOB: MUXlisten: Waiting on threads for " + boner);
-					System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
-					visit(tg, 0, boner);
-					System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
+					// int bar = foo;
+					// System.out.println("BOB: MUXlisten: Waiting on threads for " + boner);
+					// System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
+					// visit(tg, 0, boner);
+					// System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
 					// Happily spin forever :-(
 					while (foo != 0) {
 						foo = tg.activeCount() + tg.activeGroupCount();
-						if (foo != bar && foo != 0) {
-							System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
-							visit(tg, 0, boner);
-							System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
-						}
-						bar = foo;
+						// if (foo != bar && foo != 0) {
+						// 	System.out.println("\nBOB: MUXlisten: ThreadGroup dump BEGIN " + boner);
+						// 	visit(tg, 0, boner);
+						// 	System.out.println("BOB: MUXlisten: ThreadGroup dump END " + boner + "\n");
+						// }
+						// bar = foo;
 						try {
 							Thread.sleep(100); //sleep for 100 ms (One tenth second)
 						} catch (InterruptedException ex) {
@@ -297,7 +297,7 @@ public class MUXlisten implements Runnable {
 						}
 					}
 				}
-				System.out.println("BOB: MUXlisten: Threads went away. Success: " + boner);
+				// System.out.println("BOB: MUXlisten: Threads went away. Success: " + boner);
 				_log.warn("BOB: MUXlisten: Threads went away. Success: " + boner);
 				tg.destroy();
 				// Zap reference to the ThreadGroup so the JVM can GC it.
@@ -357,41 +357,4 @@ public class MUXlisten implements Runnable {
 		}
 	}
 
-	/*
-	private static void nuke(ThreadGroup group, int level) {
-	// Get threads in `group'
-	int numThreads = group.activeCount();
-	Thread[] threads = new Thread[numThreads * 2];
-	numThreads = group.enumerate(threads, false);
-	// Enumerate each thread in `group' and stop it.
-	for (int i = 0; i < numThreads; i++) {
-	// Get thread
-	Thread thread = threads[i];
-	try {
-	if (thread.isAlive()) {
-	thread.stop();
-	}
-	} catch (SecurityException se) {
-	//nop
-	}
-	}
-
-	// Get thread subgroups of `group'
-	int numGroups = group.activeGroupCount();
-	ThreadGroup[] groups = new ThreadGroup[numGroups * 2];
-	numGroups = group.enumerate(groups, false);
-
-	// Recursively visit each subgroup
-	for (int i = 0; i < numGroups; i++) {
-	nuke(groups[i], level + 1);
-	}
-	try {
-	group.destroy();
-	} catch (IllegalThreadStateException IE) {
-	//nop
-	} catch (SecurityException se) {
-	//nop
-	}
-	}
-	 */
 }
diff --git a/history.txt b/history.txt
index 22c477493..44d1e6392 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,6 @@
+2009-06-08 sponge
+    * Removed BOB debugging as-per zzz
+
 2009-06-08 sponge
     * Fixed NPE and some other goofups in BOB.
     * BOB bump version
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 9ee543940..5090cfc7b 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 16;
+    public final static long BUILD = 17;
     /** for example "-test" */
     public final static String EXTRA = "-rc";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;