Cleanup of some lexicon stuff