More state reduction