more cleaning up of menus