Disabled fallback menu and removed unused lookups