Remove TODO, this was implemented.