Removed unused env vars