Remove dependeny to client, add dependency to protocol