Remove useless todo; add upgrade code.. Not sure if this is the right place for it...