diff --git a/cmd/tmsp-cli/tmsp_cli.go b/cmd/tmsp-cli/tmsp_cli.go
deleted file mode 100644
index d90dd10b7..000000000
--- a/cmd/tmsp-cli/tmsp_cli.go
+++ /dev/null
@@ -1,270 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"strings"
-
-	. "github.com/tendermint/go-common"
-	"github.com/tendermint/go-wire"
-	"github.com/tendermint/tmsp/types"
-
-	"github.com/codegangsta/cli"
-)
-
-// connection is a global variable so it can be reused by the console
-var conn net.Conn
-
-func main() {
-	app := cli.NewApp()
-	app.Name = "cli"
-	app.Usage = "cli [command] [args...]"
-	app.Flags = []cli.Flag{
-		cli.StringFlag{
-			Name:  "address",
-			Value: "tcp://127.0.0.1:46658",
-			Usage: "address of application socket",
-		},
-	}
-	app.Commands = []cli.Command{
-		{
-			Name:  "batch",
-			Usage: "Run a batch of tmsp commands against an application",
-			Action: func(c *cli.Context) {
-				cmdBatch(app, c)
-			},
-		},
-		{
-			Name:  "console",
-			Usage: "Start an interactive tmsp console for multiple commands",
-			Action: func(c *cli.Context) {
-				cmdConsole(app, c)
-			},
-		},
-		{
-			Name:  "echo",
-			Usage: "Have the application echo a message",
-			Action: func(c *cli.Context) {
-				cmdEcho(c)
-			},
-		},
-		{
-			Name:  "info",
-			Usage: "Get some info about the application",
-			Action: func(c *cli.Context) {
-				cmdInfo(c)
-			},
-		},
-		{
-			Name:  "set_option",
-			Usage: "Set an option on the application",
-			Action: func(c *cli.Context) {
-				cmdSetOption(c)
-			},
-		},
-		{
-			Name:  "append_tx",
-			Usage: "Append a new tx to application",
-			Action: func(c *cli.Context) {
-				cmdAppendTx(c)
-			},
-		},
-		{
-			Name:  "get_hash",
-			Usage: "Get application Merkle root hash",
-			Action: func(c *cli.Context) {
-				cmdGetHash(c)
-			},
-		},
-		{
-			Name:  "commit",
-			Usage: "Commit the application state",
-			Action: func(c *cli.Context) {
-				cmdCommit(c)
-			},
-		},
-		{
-			Name:  "rollback",
-			Usage: "Roll back the application state to the latest commit",
-			Action: func(c *cli.Context) {
-				cmdRollback(c)
-			},
-		},
-	}
-	app.Before = before
-	app.Run(os.Args)
-
-}
-
-func before(c *cli.Context) error {
-	if conn == nil {
-		var err error
-		conn, err = Connect(c.GlobalString("address"))
-		if err != nil {
-			Exit(err.Error())
-		}
-	}
-	return nil
-}
-
-//--------------------------------------------------------------------------------
-
-func cmdBatch(app *cli.App, c *cli.Context) {
-	bufReader := bufio.NewReader(os.Stdin)
-	for {
-		line, more, err := bufReader.ReadLine()
-		if more {
-			Exit("input line is too long")
-		} else if err == io.EOF {
-			break
-		} else if len(line) == 0 {
-			continue
-		} else if err != nil {
-			Exit(err.Error())
-		}
-		args := []string{"tmsp"}
-		args = append(args, strings.Split(string(line), " ")...)
-		app.Run(args)
-	}
-}
-
-func cmdConsole(app *cli.App, c *cli.Context) {
-	for {
-		fmt.Printf("> ")
-		bufReader := bufio.NewReader(os.Stdin)
-		line, more, err := bufReader.ReadLine()
-		if more {
-			Exit("input is too long")
-		} else if err != nil {
-			Exit(err.Error())
-		}
-
-		args := []string{"tmsp"}
-		args = append(args, strings.Split(string(line), " ")...)
-		app.Run(args)
-	}
-}
-
-// Have the application echo a message
-func cmdEcho(c *cli.Context) {
-	args := c.Args()
-	if len(args) != 1 {
-		Exit("echo takes 1 argument")
-	}
-	res, err := makeRequest(conn, types.RequestEcho{args[0]})
-	if err != nil {
-		Exit(err.Error())
-	}
-	fmt.Println(res)
-}
-
-// Get some info from the application
-func cmdInfo(c *cli.Context) {
-	res, err := makeRequest(conn, types.RequestInfo{})
-	if err != nil {
-		Exit(err.Error())
-	}
-	fmt.Println(res)
-}
-
-// Set an option on the application
-func cmdSetOption(c *cli.Context) {
-	args := c.Args()
-	if len(args) != 2 {
-		Exit("set_option takes 2 arguments (key, value)")
-	}
-	_, err := makeRequest(conn, types.RequestSetOption{args[0], args[1]})
-	if err != nil {
-		Exit(err.Error())
-	}
-	fmt.Printf("%s=%s\n", args[0], args[1])
-}
-
-// Append a new tx to application
-func cmdAppendTx(c *cli.Context) {
-	args := c.Args()
-	if len(args) != 1 {
-		Exit("append_tx takes 1 argument")
-	}
-	txString := args[0]
-	tx := []byte(txString)
-	if len(txString) > 2 && strings.HasPrefix(txString, "0x") {
-		var err error
-		tx, err = hex.DecodeString(txString[2:])
-		if err != nil {
-			Exit(err.Error())
-		}
-	}
-
-	res, err := makeRequest(conn, types.RequestAppendTx{tx})
-	if err != nil {
-		Exit(err.Error())
-	}
-	fmt.Println("Response:", res)
-}
-
-// Get application Merkle root hash
-func cmdGetHash(c *cli.Context) {
-	res, err := makeRequest(conn, types.RequestGetHash{})
-	if err != nil {
-		Exit(err.Error())
-	}
-	fmt.Printf("%X\n", res.(types.ResponseGetHash).Hash)
-}
-
-// Commit the application state
-func cmdCommit(c *cli.Context) {
-	_, err := makeRequest(conn, types.RequestCommit{})
-	if err != nil {
-		Exit(err.Error())
-	}
-	fmt.Println("Committed.")
-}
-
-// Roll back the application state to the latest commit
-func cmdRollback(c *cli.Context) {
-	_, err := makeRequest(conn, types.RequestRollback{})
-	if err != nil {
-		Exit(err.Error())
-	}
-	fmt.Println("Rolled back.")
-}
-
-//--------------------------------------------------------------------------------
-
-func makeRequest(conn net.Conn, req types.Request) (types.Response, error) {
-	var n int
-	var err error
-
-	// Write desired request
-	wire.WriteBinaryLengthPrefixed(req, conn, &n, &err)
-	if err != nil {
-		return nil, err
-	}
-
-	// Write flush request
-	wire.WriteBinaryLengthPrefixed(types.RequestFlush{}, conn, &n, &err)
-	if err != nil {
-		return nil, err
-	}
-
-	// Read desired response
-	var res types.Response
-	wire.ReadBinaryPtrLengthPrefixed(&res, conn, 0, &n, &err)
-	if err != nil {
-		return nil, err
-	}
-
-	// Read flush response
-	var resFlush types.ResponseFlush
-	wire.ReadBinaryPtrLengthPrefixed(&resFlush, conn, 0, &n, &err)
-	if err != nil {
-		return nil, err
-	}
-
-	return res, nil
-}