[Client] - remove commented out code