Get rid of superfluous environmental logic