Cleanup the popovercontroller usage