Address code review comemnts and purge additional dead code. Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com> Upstream-commit: f250152bf4 Component: cli
f250152bf4