More code cleanup for variant menus