Forgot to remove the old TODO version