Removal of extraneous transformations which should slightly improve language model generation time, assorted cleanup.