Fix more unused class private variable issues