cleaning up some pairing stuff