Remove transitional code.
More work on the multiple LexemModels