Remove TODO, this work will happen elsewhere.