handbidState cleanup