Why remove the todo?  Is there an issue for this refactor?