Remove some unnecessary lines of code
Checkpoint