Replace a TODO with a comment for options