cleanup for ccd support.