rationalize service deletion in E2E functests