(Menu) Get rid of some unnecessary HAVE_MENU ifdefs