diff --git a/Gopkg.lock b/Gopkg.lock
index 46cb95893..267acf32b 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -458,6 +458,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "0eb39694057c8ab8c9ecbaeb25bc43cbf1d2422976a09a67392a62dcef149a7b"
+  inputs-digest = "cce90fda84a63ae5b41b40f0edc357eec4020d17fdd61585960ad537418749ea"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/x/stake/commands/tx.go b/x/stake/commands/tx.go
index 431483288..90b289de7 100644
--- a/x/stake/commands/tx.go
+++ b/x/stake/commands/tx.go
@@ -91,13 +91,9 @@ func GetCmdDeclareCandidacy(cdc *wire.Codec) *cobra.Command {
 			}
 			msg := stake.NewMsgDeclareCandidacy(candidateAddr, pk, amount, description)
 
-			name, pass, err := getNamePassword()
-			if err != nil {
-				return err
-			}
-
 			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, pass, msg, cdc)
+			name := viper.GetString(client.FlagName)
+			res, err := builder.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
@@ -132,13 +128,9 @@ func GetCmdEditCandidacy(cdc *wire.Codec) *cobra.Command {
 			}
 			msg := stake.NewMsgEditCandidacy(candidateAddr, description)
 
-			name, pass, err := getNamePassword()
-			if err != nil {
-				return err
-			}
-
 			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, pass, msg, cdc)
+			name := viper.GetString(client.FlagName)
+			res, err := builder.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
@@ -172,13 +164,9 @@ func GetCmdDelegate(cdc *wire.Codec) *cobra.Command {
 
 			msg := stake.NewMsgDelegate(delegatorAddr, candidateAddr, amount)
 
-			name, pass, err := getNamePassword()
-			if err != nil {
-				return err
-			}
-
 			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, pass, msg, cdc)
+			name := viper.GetString(client.FlagName)
+			res, err := builder.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
@@ -223,13 +211,9 @@ func GetCmdUnbond(cdc *wire.Codec) *cobra.Command {
 
 			msg := stake.NewMsgUnbond(delegatorAddr, candidateAddr, sharesStr)
 
-			name, pass, err := getNamePassword()
-			if err != nil {
-				return err
-			}
-
 			// build and sign the transaction, then broadcast to Tendermint
-			res, err := builder.SignBuildBroadcast(name, pass, msg, cdc)
+			name := viper.GetString(client.FlagName)
+			res, err := builder.SignBuildBroadcast(name, msg, cdc)
 			if err != nil {
 				return err
 			}
diff --git a/x/stake/handler.go b/x/stake/handler.go
index 151bf898c..b52731aed 100644
--- a/x/stake/handler.go
+++ b/x/stake/handler.go
@@ -242,15 +242,8 @@ func handleMsgUnbond(ctx sdk.Context, msg MsgUnbond, k Keeper) sdk.Result {
 	}
 
 	// retrieve the amount of bonds to remove (TODO remove redundancy already serialized)
-	var shares sdk.Rat
-	var err sdk.Error
 	if msg.Shares == "MAX" {
 		shares = bond.Shares
-	} else {
-		shares, err = sdk.NewRatFromDecimal(msg.Shares)
-		if err != nil {
-			return err.Result()
-		}
 	}
 
 	// subtract bond tokens from delegator bond