[client] Clean up by using the previously added helper functions.