Simplify unnecessary calls
Merge pull request #47 from mlocati/dont-call-useless-calls

Simplify unnecessary calls