move last bit of sanity scripts into validations