Remove -protocol dependency from -client.