Is this todo no longer valid?