Remove extra popover code