is this TODO still needed?