more language cleanup