Tweaked long upgrade names.
Removed stuff we no longer need.