Remove remaining references to "isValid"