[FOLD] Cleanup of Peers api