moving the removals out of the upgrade case
Merge pull request #336 from zinic/master

moving the removals out of the upgrade case