Moving environment variable checks to features