Removing code related to adaptors. Needs to be either handled externally or defined properly for this context. Also cleaned up code related to comparing the two mates. This code is not tested and probably not including some subtleties.