was a little too hasty in removing TODOs.