More code cleanup prior to making graphs for CD with energy.