Some cleanup on server side client-related code