Merge "Cleaning up code to deal with language changes"