Remove TODO as something to do