A little cleanup and some CCC model system updates.
Merge with upstream