Is this TODO relevant?