move patch_checks
make oos build work again
cleanup