cleanup menus

remove old declarations and negative indents