Small cleanup now that we have multiple details about the server stored on the cli Upstream-commit: db8f631c1f Component: cli
db8f631c1f