Minor cleanup of Lingustics code (lose old std::string code)