Clean up Checkpoints class