Merge "Remove env variable"