Clean up YYY comments; leave an actionable XXX comment