Added upgrade cleanup