Some menu items cleanup