remove some unrelated upgrade code