Misc cleanup
checkpoint
Code cleanup