rationalize service deletion in E2E functests

No match.