Remove TODO, this is implemented now.