remove TODO from finished 2.38