Remove unnecessary system-env construct for simplicity.