removed unneeded ENV variables
Merge commit '81d6fbe37a7e1001f9a36653e3f6e3ade05b270e'