Merge "Remove unused clients in setup_clients"