Consistency gaurd
Also removes the verification rigor flag, which is currently not being used. (it was always set to full verification)
Also removes the verification rigor flag, which is currently not being used. (it was always set to full verification)