Remove bitmap hunter warnings and unneccesary checks
Merge pull request #720 from square/dimitris/minor-cleanup

Remove bitmap hunter warnings and unneccesary checks