Remove TODO from yore