Remove no longer needed spans for menubar (slipped the last cleanup it seems)