Remove unnecessary checkpointing/rollback pairs

Remove unnecessary checkpointing/rollback pairs