Few more non CCC-Public references removed.