Remove peeraddr dependency