Stripping some cruft from Env