Remove bitmap hunter warnings and unneccesary checks

This did not take into consideration `action` which might be there.