add client cleanup