Remove unused code
view cleanups
menus