Merge "Remove unused client in setup_clients"