Remove TODO. There is an issue tracker for that.