schedule more sanity to be moved into validations
move last bit of sanity scripts into validations