OP-1363 cleanups to sanitychecks