Address code review comemnts and purge additional dead code. Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com> (cherry picked from commit f250152bf4932375fd279a4a8f27ca721cbaa948) Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Address code review comemnts and purge additional dead code. Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com> (cherry picked from commit f250152bf4932375fd279a4a8f27ca721cbaa948) Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>