cleanup of menu_helper
follow up