Eliminate old TODO