Clean-up/fix script validations