removed always true conditional