Peer mgr code cleanup