diff --git a/client/config/toml.go b/client/config/toml.go
index 592ac32d2fb2..fa8886e2e91b 100644
--- a/client/config/toml.go
+++ b/client/config/toml.go
@@ -18,12 +18,12 @@ const defaultConfigTemplate = `# This is a TOML config file.
 ###############################################################################
 
 
-chain-id = "{{ .ClientConfig.ChainID }}"
-keyring-backend = "{{ .ClientConfig.KeyringBackend }}"
-output = "{{ .ClientConfig.Output }}"
-node = "{{ .ClientConfig.Node }}"
-broadcast-mode = "{{ .ClientConfig.BroadcastMode }}"
-trace = "{{ .ClientConfig.Trace }}"
+chain-id = "{{ .ChainID }}"
+keyring-backend = "{{ .KeyringBackend }}"
+output = "{{ .Output }}"
+node = "{{ .Node }}"
+broadcast-mode = "{{ .BroadcastMode }}"
+trace = "{{ .Trace }}"
 `
 
 // InitConfigTemplate initiates config template that will be used in
diff --git a/go.mod b/go.mod
index 3fc4d5184bf3..d409d401313f 100644
--- a/go.mod
+++ b/go.mod
@@ -29,9 +29,8 @@ require (
 	github.com/improbable-eng/grpc-web v0.14.0
 	github.com/magiconair/properties v1.8.4
 	github.com/mattn/go-isatty v0.0.12
-	github.com/mitchellh/mapstructure v1.3.3
 	github.com/otiai10/copy v1.5.0
-	github.com/pelletier/go-toml v1.8.1
+	github.com/pelletier/go-toml v1.8.1 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.9.0
 	github.com/prometheus/common v0.18.0
diff --git a/server/util.go b/server/util.go
index 6efc2fc4f0a4..d61bdcd18396 100644
--- a/server/util.go
+++ b/server/util.go
@@ -243,6 +243,7 @@ func interceptConfigs(rootViper *viper.Viper) (*tmcfg.Config, error) {
 		return nil, fmt.Errorf("failed to merge configuration: %w", err)
 	}
 
+	// TODO test It if it works
 	// Adding default ClientConfig and writing it into "client.toml"
 	cliCfgFilePath := filepath.Join(configPath, "client.toml")
 	//	if _, err := os.Stat(cliCfgFilePath); os.IsNotExist(err) {