Yes, I think the TODO is unnecessary.