Remove TODO that is no longer relevant