Checkpoint cleanup

@Samerlkhodary Is everything clear now?