some cleaning - fewer menus