Merge "[sfc] Remove setup_clients method"