PROV-70 | Get rid of the TODO comment