Removed a lot of cruft from OPNavigationController