Remove unused code
Remove unused popover code
Progress with updating to UIAlertControllers