More langugage cleanup.