remove print_checkpoint
more cleanup