remove env, keep context