checkpoint
Further cleanup.