Simplify cdc.cpp