Popover cleanup