vpi: clean up