Remove copy/pasta in client.cpp