Get rid of env based choice