Remove TODO that is no longer really needed