Remove unused code.
CCA model code reorganization.