Merge "Remove unnecessary setup_clients methods"