[minor] Remove some redundant checks
Merge pull request #315 from primus/redundant-checks

Remove some redundant checks