Checkpoint; some cleanup accomplished