Misc CLI cleanup