Remove env vars no longer used.