Kill unneeded variables in client test