Remove commented code blocks Remove some duplication in comparing and restructuring env Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: c7fad9b750f8f143a22cc5a85a1dc26573025414 Component: engine