Clean up menu and flows submenu