more environment cleanup