Some engineering fixes here and there

make sure we remove witnesses before sending out to solver