cli: cleanup

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