Remove what? The TODOs are still current.