Removed redundant env vars