Merge "Remove unsed client variables"