Merge "Remove redundant setup_client method"