Language cleanup, part 1.
Conflicts solved