code cleanup
new ccdFinal definition