I think you can remove the TODO.