Cleaning up inconsistencies in ClientDataValidator.java