Progress on configuration cleanup.