cleanup for ccd support.
Merge pull request #312 from amida-tech/ui-fixes-mm

cleanup for ccd support.