Tidy up PeerFinder
Don't use callbacks to activate PeerFinder slots