Remove TODO, but keep comment (because it's not really a TODO).