removing env logic