Merge "Remove TODO comment that was already done"