diff --git a/cmd/tendermint/commands/testnet.go b/cmd/tendermint/commands/testnet.go
index 6398f4ebd..7ec679982 100644
--- a/cmd/tendermint/commands/testnet.go
+++ b/cmd/tendermint/commands/testnet.go
@@ -85,6 +85,11 @@ func testnetFiles(cmd *cobra.Command, args []string) error {
 			_ = os.RemoveAll(outputDir)
 			return err
 		}
+		err = os.MkdirAll(filepath.Join(nodeDir, "data"), nodeDirPerm)
+		if err != nil {
+			_ = os.RemoveAll(outputDir)
+			return err
+		}
 
 		initFilesWithConfig(config)
 
diff --git a/scripts/wire2amino.go b/scripts/wire2amino.go
index da23c30cc..459d80e08 100644
--- a/scripts/wire2amino.go
+++ b/scripts/wire2amino.go
@@ -39,15 +39,6 @@ type NodeKey struct {
 	PrivKey Data `json:"priv_key"`
 }
 
-type PrivVal struct {
-	Address    cmn.HexBytes `json:"address"`
-	LastHeight int64        `json:"last_height"`
-	LastRound  int          `json:"last_round"`
-	LastStep   int8         `json:"last_step"`
-	PubKey     Data         `json:"pub_key"`
-	PrivKey    Data         `json:"priv_key"`
-}
-
 type PrivValKey struct {
 	Address cmn.HexBytes `json:"address"`
 	PubKey  Data         `json:"pub_key"`