Some cleanup of environment vars