Remove iPad specific code with Popover management.