Cleanup and finalize the new "visibility optimized" menus