- Part one of the language cleanup