Is this TODO needed?