remove excess isRequired condition