remove TODO, all done