Cleaning up qupgrade parts in main source tree

These were parts of qupgrade which were incorrectly in the main source tree instead of the submodule. They are all currently unused. Working my way towards integrating qupgrade directly into the source tree followed by rework and hopefully finally get windows flashing working reliably.