do not hold bitfield for peer
refactor