Remove redundant conditions
Merge pull request #1251 from lioncash/cond

Remove redundant conditions