removing useless env vars
merging