Remove bitmap hunter warnings and unneccesary checks