Merge "Remove setup_clients"