Remove some redundant clauses
Merge pull request #1026 from flack/patch-5

Remove some redundant clauses