Remove null validations