Cleanup and checkpoints
Cleanup and checkpoints