Got rid of needless (and possible overwriting of) global environment variables.