Merge "Remove a redundant client variable"