remove unneeded env checks