Cleaning up the CC interface - removing commented out code