clean up SERVER ifdefs in both client.cpp