Remove a redundant TODO as all the issues have been addressed