clean up some stray TODOs