Remove selection tracking from menu and directly into menu items