Cleanup & More Checkpoints!