Cleanup of menu, especially intentity stuff