Cgia improvement impl

Remove unnecessary checkpointing/rollback pairs