Fixes for removing menus and menu items.