Get rid of isValid methods