cleanup menus part 1