src: remove two TODO that are done/unneeded