Deprecate separate client_id