cli: cleanup

Change-Id: I051dd8ee06bbbc115ca963cbc1bc1be2c816ae6c
Signed-off-by: Michael pasternak <mpastern@redhat.com>