Remove bitmask code