Replace old style validations with newer style validations + more cleanup.