Making clean_env() optional.