Actually do we need this TODO still?