Merge "Use server_client clearly for removing server_group"