Remove useless includes
Remove unused param from UserCmdGetContract
Merge pull request #277 from mhamrle/small_improvements

Small improvements