#1 cleanup for e2e testing