is this TODO still necessary?