Build env cleanups