Clean-up shell run and run_subcommand methods

Remove else branch of try-catch block since
it is never executed.

Get rid of passing result to shell clean-up function
since it is not used.

Change-Id: I9360d1e27fc203672ba0511b58172f5c776bdfb6
Merge "Clean-up shell run and run_subcommand methods"