remove references to Pair because deprecation