HM/TS: removed TODO.