Minor changes, get rid of a duplicate menu item.