diff --git a/main.cpp b/main.cpp
index e023b42ea..b2de78bae 100644
--- a/main.cpp
+++ b/main.cpp
@@ -146,7 +146,7 @@ static int main(const char *homeDir,int argc,char **argv)
 					printHelp(stdout,argv[0]);
 					return 1;
 			}
-		} else {
+		} else if ((!homeDir)||(strcmp(homeDir,argv[i]))) {
 			if (query.length())
 				query.push_back(' ');
 			query.append(argv[i]);
diff --git a/testnet/clean-local-testnet.sh b/testnet/clean-local-testnet.sh
new file mode 100755
index 000000000..1d6b7f0df
--- /dev/null
+++ b/testnet/clean-local-testnet.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+export PATH=/bin:/usr/bin:/usr/local/bin
+
+rm -rfv local-testnet/n????
+find local-testnet -type f ! -name 'identity.*' -print0 | xargs -0 rm -fv
+rm -rfv local-testnet/sn????/networks.d