Checkpoint; pre more cleanup