Remove TODO, as it is irrelevant