vigor: Proper tree clean up