Is this TODO safe to keep with your changes here?