diff --git a/contrib/local/00-genesis.sh b/contrib/local/00-genesis.sh
deleted file mode 100755
index 2d8834c700..0000000000
--- a/contrib/local/00-genesis.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -o errexit -o nounset -o pipefail
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-BASE_ACCOUNT=$(wasmd keys show validator -a)
-
-echo "-----------------------"
-echo "## Genesis CosmWasm contract"
-wasmd add-wasm-genesis-message store "$DIR/../../x/wasm/keeper/testdata/hackatom.wasm" --instantiate-everybody true --builder=foo/bar:latest --run-as validator
-
-echo "-----------------------"
-echo "## Genesis CosmWasm instance"
-INIT="{\"verifier\":\"$(wasmd keys show validator -a)\", \"beneficiary\":\"$(wasmd keys show fred -a)\"}"
-wasmd add-wasm-genesis-message instantiate-contract 1 "$INIT" --run-as validator --label=foobar --amount=100ustake --admin "$BASE_ACCOUNT"
-
-echo "-----------------------"
-echo "## Genesis CosmWasm execute"
-FIRST_CONTRACT_ADDR=wasm18vd8fpwxzck93qlwghaj6arh4p7c5n89k7fvsl
-MSG='{"release":{}}'
-wasmd add-wasm-genesis-message execute $FIRST_CONTRACT_ADDR "$MSG" --run-as validator --amount=1ustake
-
-echo "-----------------------"
-echo "## List Genesis CosmWasm codes"
-wasmd add-wasm-genesis-message list-codes
-
-echo "-----------------------"
-echo "## List Genesis CosmWasm contracts"
-wasmd add-wasm-genesis-message list-contracts
diff --git a/contrib/local/start_node.sh b/contrib/local/start_node.sh
index 95785c3b62..30e078eb9f 100755
--- a/contrib/local/start_node.sh
+++ b/contrib/local/start_node.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 set -eu
 
-wasmd start --rpc.laddr tcp://0.0.0.0:26657 --log_level=info --trace # --trace # does not work anymore: --log_level="main:info,state:debug,*:error"
+wasmd start --rpc.laddr tcp://0.0.0.0:26657 --log_level=info  --trace #remove trace flag if you don't wantg the stack trace to be printed
diff --git a/x/wasm/client/cli/query.go b/x/wasm/client/cli/query.go
index a621ba0825..ab346bcfe1 100644
--- a/x/wasm/client/cli/query.go
+++ b/x/wasm/client/cli/query.go
@@ -63,6 +63,7 @@ func GetCmdLibVersion() *cobra.Command {
 			fmt.Println(version)
 			return nil
 		},
+		SilenceUsage: true,
 	}
 	return cmd
 }
@@ -103,6 +104,7 @@ func GetCmdBuildAddress() *cobra.Command {
 			cmd.Println(keeper.BuildContractAddressPredictable(codeHash, creator, salt, msg).String())
 			return nil
 		},
+		SilenceUsage: true,
 	}
 	decoder.RegisterFlags(cmd.PersistentFlags(), "salt")
 	return cmd