A stopping point for the pairing removal work (more to come)