More client cleanup