Removing bad env var check

Cutting etcdctl and chef out of common level