Fix things broke by menu path change, cruft code removal.