Removed old stuff
Improvements to some upgrades