Remove 2.2.x->3.0/4.0 upgrade code