Client wrapper cleanup