Some cleanup on the CV timeline.