Merge "Remove setup_clients method"