removal of server code which now lives in server client