clean env stuff up a bit