v1.7 and common ckpt, cleanup