Removed working for upgrade

Bench tested

No other items included