Why removing this TODO ?