is this TODO comment still relevant?