Change to remove checkpoints