Cleanup of CLI docs and code.