Cleaned up to "checkpoint"