When adding the GetMatchinPair implementation, some clean-ups were done, for further details please see #1821