Remove TODO, it's finished