Cleanup: remove env dependency