diff --git a/x/auth/mock/app.go b/x/auth/mock/app.go
deleted file mode 100644
index 1ef99780d..000000000
--- a/x/auth/mock/app.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package mock
-
-import (
-	"os"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	dbm "github.com/tendermint/tendermint/libs/db"
-	"github.com/tendermint/tendermint/libs/log"
-
-	bam "github.com/cosmos/cosmos-sdk/baseapp"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/wire"
-	"github.com/cosmos/cosmos-sdk/x/auth"
-)
-
-// Extended ABCI application
-type App struct {
-	*bam.BaseApp
-	Cdc        *wire.Codec // public since the codec is passed into the module anyways.
-	KeyMain    *sdk.KVStoreKey
-	KeyAccount *sdk.KVStoreKey
-
-	// TODO: Abstract this out from not needing to be auth specifically
-	AccountMapper       auth.AccountMapper
-	FeeCollectionKeeper auth.FeeCollectionKeeper
-
-	GenesisAccounts []auth.Account
-}
-
-// partially construct a new app on the memstore for module and genesis testing
-func NewApp() *App {
-	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
-	db := dbm.NewMemDB()
-
-	// create the cdc with some standard codecs
-	cdc := wire.NewCodec()
-	sdk.RegisterWire(cdc)
-	wire.RegisterCrypto(cdc)
-	auth.RegisterWire(cdc)
-
-	// create your application object
-	app := &App{
-		BaseApp:    bam.NewBaseApp("mock", cdc, logger, db),
-		Cdc:        cdc,
-		KeyMain:    sdk.NewKVStoreKey("main"),
-		KeyAccount: sdk.NewKVStoreKey("acc"),
-	}
-
-	// define the accountMapper
-	app.AccountMapper = auth.NewAccountMapper(
-		app.Cdc,
-		app.KeyAccount,      // target store
-		&auth.BaseAccount{}, // prototype
-	)
-
-	// initialize the app, the chainers and blockers can be overwritten before calling complete setup
-	app.SetInitChainer(app.InitChainer)
-
-	app.SetAnteHandler(auth.NewAnteHandler(app.AccountMapper, app.FeeCollectionKeeper))
-
-	return app
-}
-
-// complete the application setup after the routes have been registered
-func (app *App) CompleteSetup(newKeys []*sdk.KVStoreKey) error {
-	newKeys = append(newKeys, app.KeyMain)
-	newKeys = append(newKeys, app.KeyAccount)
-	app.MountStoresIAVL(newKeys...)
-	err := app.LoadLatestVersion(app.KeyMain)
-	return err
-}
-
-// custom logic for initialization
-func (app *App) InitChainer(ctx sdk.Context, _ abci.RequestInitChain) abci.ResponseInitChain {
-
-	// load the accounts
-	for _, genacc := range app.GenesisAccounts {
-		acc := app.AccountMapper.NewAccountWithAddress(ctx, genacc.GetAddress())
-		err := acc.SetCoins(genacc.GetCoins())
-		if err != nil {
-			// TODO: Handle with #870
-			panic(err)
-		}
-		app.AccountMapper.SetAccount(ctx, acc)
-	}
-
-	return abci.ResponseInitChain{}
-}
-
-// Generate genesis accounts loaded with coins, and returns their addresses, pubkeys, and privkeys
-func CreateGenAccounts(numAccs int64, genCoins sdk.Coins) (genAccs []auth.Account, addrs []sdk.AccAddress, pubKeys []crypto.PubKey, privKeys []crypto.PrivKey) {
-	for i := int64(0); i < numAccs; i++ {
-		privKey := crypto.GenPrivKeyEd25519()
-		pubKey := privKey.PubKey()
-		addr := sdk.AccAddress(pubKey.Address())
-
-		genAcc := &auth.BaseAccount{
-			Address: addr,
-			Coins:   genCoins,
-		}
-
-		genAccs = append(genAccs, genAcc)
-		privKeys = append(privKeys, privKey)
-		pubKeys = append(pubKeys, pubKey)
-		addrs = append(addrs, addr)
-	}
-
-	return
-}
diff --git a/x/auth/mock/auth_app_test.go b/x/auth/mock/auth_app_test.go
deleted file mode 100644
index 5ee4ff95b..000000000
--- a/x/auth/mock/auth_app_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package mock
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-)
-
-// A mock transaction that has a validation which can fail.
-type testMsg struct {
-	signers     []sdk.AccAddress
-	positiveNum int64
-}
-
-// TODO: Clean this up, make it public
-const msgType = "testMsg"
-
-func (tx testMsg) Type() string                       { return msgType }
-func (tx testMsg) GetMsg() sdk.Msg                    { return tx }
-func (tx testMsg) GetMemo() string                    { return "" }
-func (tx testMsg) GetSignBytes() []byte               { return nil }
-func (tx testMsg) GetSigners() []sdk.AccAddress       { return tx.signers }
-func (tx testMsg) GetSignatures() []auth.StdSignature { return nil }
-func (tx testMsg) ValidateBasic() sdk.Error {
-	if tx.positiveNum >= 0 {
-		return nil
-	}
-	return sdk.ErrTxDecode("positiveNum should be a non-negative integer.")
-}
-
-// test auth module messages
-
-var (
-	priv1 = crypto.GenPrivKeyEd25519()
-	addr1 = sdk.AccAddress(priv1.PubKey().Address())
-	priv2 = crypto.GenPrivKeyEd25519()
-	addr2 = sdk.AccAddress(priv2.PubKey().Address())
-
-	coins    = sdk.Coins{sdk.NewCoin("foocoin", 10)}
-	testMsg1 = testMsg{signers: []sdk.AccAddress{addr1}, positiveNum: 1}
-)
-
-// initialize the mock application for this module
-func getMockApp(t *testing.T) *App {
-	mapp := NewApp()
-
-	mapp.Router().AddRoute(msgType, func(ctx sdk.Context, msg sdk.Msg) (res sdk.Result) { return })
-	require.NoError(t, mapp.CompleteSetup([]*sdk.KVStoreKey{}))
-	return mapp
-}
-
-func TestMsgPrivKeys(t *testing.T) {
-	mapp := getMockApp(t)
-	mapp.Cdc.RegisterConcrete(testMsg{}, "mock/testMsg", nil)
-
-	// Construct some genesis bytes to reflect basecoin/types/AppAccount
-	// Give 77 foocoin to the first key
-	coins := sdk.Coins{sdk.NewCoin("foocoin", 77)}
-	acc1 := &auth.BaseAccount{
-		Address: addr1,
-		Coins:   coins,
-	}
-	accs := []auth.Account{acc1}
-
-	// Construct genesis state
-	SetGenesis(mapp, accs)
-
-	// A checkTx context (true)
-	ctxCheck := mapp.BaseApp.NewContext(true, abci.Header{})
-	res1 := mapp.AccountMapper.GetAccount(ctxCheck, addr1)
-	require.Equal(t, acc1, res1.(*auth.BaseAccount))
-
-	// Run a CheckDeliver
-	SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{testMsg1}, []int64{0}, []int64{0}, true, priv1)
-
-	// signing a SendMsg with the wrong privKey should be an auth error
-	mapp.BeginBlock(abci.RequestBeginBlock{})
-	tx := GenTx([]sdk.Msg{testMsg1}, []int64{0}, []int64{1}, priv2)
-	res := mapp.Deliver(tx)
-	require.Equal(t, sdk.ToABCICode(sdk.CodespaceRoot, sdk.CodeUnauthorized), res.Code, res.Log)
-
-	// resigning the tx with the correct priv key should still work
-	res = SignCheckDeliver(t, mapp.BaseApp, []sdk.Msg{testMsg1}, []int64{0}, []int64{1}, true, priv1)
-
-	require.Equal(t, sdk.ToABCICode(sdk.CodespaceRoot, sdk.CodeOK), res.Code, res.Log)
-}
diff --git a/x/auth/mock/simulate_block.go b/x/auth/mock/simulate_block.go
deleted file mode 100644
index 90241ae81..000000000
--- a/x/auth/mock/simulate_block.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package mock
-
-import (
-	"testing"
-
-	"github.com/cosmos/cosmos-sdk/baseapp"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/auth"
-	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/crypto"
-
-	abci "github.com/tendermint/tendermint/abci/types"
-)
-
-var chainID = "" // TODO
-
-// set the mock app genesis
-func SetGenesis(app *App, accs []auth.Account) {
-
-	// pass the accounts in via the application (lazy) instead of through RequestInitChain
-	app.GenesisAccounts = accs
-
-	app.InitChain(abci.RequestInitChain{})
-	app.Commit()
-}
-
-// check an account balance
-func CheckBalance(t *testing.T, app *App, addr sdk.AccAddress, exp sdk.Coins) {
-	ctxCheck := app.BaseApp.NewContext(true, abci.Header{})
-	res := app.AccountMapper.GetAccount(ctxCheck, addr)
-	require.Equal(t, exp, res.GetCoins())
-}
-
-// generate a signed transaction
-func GenTx(msgs []sdk.Msg, accnums []int64, seq []int64, priv ...crypto.PrivKeyEd25519) auth.StdTx {
-
-	// make the transaction free
-	fee := auth.StdFee{
-		sdk.Coins{sdk.NewCoin("foocoin", 0)},
-		100000,
-	}
-
-	sigs := make([]auth.StdSignature, len(priv))
-	memo := "testmemotestmemo"
-	for i, p := range priv {
-		sig, err := p.Sign(auth.StdSignBytes(chainID, accnums[i], seq[i], fee, msgs, memo))
-		if err != nil {
-			panic(err)
-		}
-		sigs[i] = auth.StdSignature{
-			PubKey:        p.PubKey(),
-			Signature:     sig,
-			AccountNumber: accnums[i],
-			Sequence:      seq[i],
-		}
-	}
-	return auth.NewStdTx(msgs, fee, sigs, memo)
-}
-
-// generate a set of signed transactions a msg, that differ only by having the
-// sequence numbers incremented between every transaction.
-func GenSequenceOfTxs(msgs []sdk.Msg, accnums []int64, initSeqNums []int64, numToGenerate int, priv ...crypto.PrivKeyEd25519) []auth.StdTx {
-	txs := make([]auth.StdTx, numToGenerate, numToGenerate)
-	for i := 0; i < numToGenerate; i++ {
-		txs[i] = GenTx(msgs, accnums, initSeqNums, priv...)
-		incrementAllSequenceNumbers(initSeqNums)
-	}
-	return txs
-}
-
-func incrementAllSequenceNumbers(initSeqNums []int64) {
-	for i := 0; i < len(initSeqNums); i++ {
-		initSeqNums[i]++
-	}
-}
-
-// check a transaction result
-func SignCheck(app *baseapp.BaseApp, msgs []sdk.Msg, accnums []int64, seq []int64, priv ...crypto.PrivKeyEd25519) sdk.Result {
-	tx := GenTx(msgs, accnums, seq, priv...)
-	res := app.Check(tx)
-	return res
-}
-
-// simulate a block
-func SignCheckDeliver(t *testing.T, app *baseapp.BaseApp, msgs []sdk.Msg, accnums []int64, seq []int64, expPass bool, priv ...crypto.PrivKeyEd25519) sdk.Result {
-
-	// Sign the tx
-	tx := GenTx(msgs, accnums, seq, priv...)
-
-	// Run a Check
-	res := app.Check(tx)
-	if expPass {
-		require.Equal(t, sdk.ABCICodeOK, res.Code, res.Log)
-	} else {
-		require.NotEqual(t, sdk.ABCICodeOK, res.Code, res.Log)
-	}
-
-	// Simulate a Block
-	app.BeginBlock(abci.RequestBeginBlock{})
-	res = app.Deliver(tx)
-	if expPass {
-		require.Equal(t, sdk.ABCICodeOK, res.Code, res.Log)
-	} else {
-		require.NotEqual(t, sdk.ABCICodeOK, res.Code, res.Log)
-	}
-	app.EndBlock(abci.RequestEndBlock{})
-
-	app.Commit()
-	return res
-}