misc cleanup (mostly old TODOs)