Cleanup extend client logic for sync and async clients (#2808)

Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
1 file changed