More menu tidying, get rid of redundant $menus