remove class variables from Client