Update some CC handling.

code cleanup