Remove unexpected comma plus TODO comments.