Using now-available ENV.delete

thanks to #521