code cleanup
Checkpoint in recovery from borked git.