WIP: clean up effectively in manual test