Checkpoint (some cleanup)