Better clean up after end2end test