More ENV cleanups