more popover cleanup