cleanup
rename old TODOs, checkpoint fixing tests