cleanup pop-over handling