We should remove this TODO