Clean up submenu handling