Clean up set-env