TSAGE: R2R - Remove obsolete TODO