Remove obsolete TODO comments