Removing use of env which only seems to be blowing up