Removing more validation code.