Been there, done that, remove the TODO.