Cleanup, and further reconcile with env at work.