Actually just remove bijection, we hardly use it