Merge "Remove setup_client method"