cleanup hopefuly final