Remove is_bit_set and nothing

This should not change any logic, but please carefully review 7537bb9