Cleaning up validations