removed env var check