wrapper cleanup