Clean up unnecessary code for proper display of menu with and without fallback