Remove commented code in environ module