Checkpoint, about to cleanup a bit