subtle cleanups
checkpoint