cleaned up server message handler and removed ClientMessage confusion