Issue #8418 by tuj: Removed unused menu items.