Remove always true argument and unused field.