Add removal of checkpoints.
Change formats of file names.