moving the removals out of the upgrade case