Fix deprecations

And remove iPod menu item.