language support code cleanup!