Remove ClientBuilder
@internal annotation
#1661
Merged
ClientBuilder
@internal annotation
#1661