cleanup work for upgraders