Merge "Remove unnecessary str() from some clients"