Removing resolved TODO comment