Clean up PaVeReduce
Add aux functions