Clean up CLI commands

Change-Id: If3ba6d0a9fa27ac7b4ec6115264f5a56a6700338
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>