Removing unnecessary reference to environment variable