Remove always true conditional