Remove TODO already done.