vigor: clean up