Simplify p2pclient locking even further