[master] Language-related stuff cleanup