#20306Code cleanup for flash uploader.
Description
This is just a side patch to split the code cleanup of two files from the actual functionality of the new flash uploader.
This part does (hopefully) no functional change.
(issue imported from #M10895)
Reviews 0
No change resolves or names this issue in its commit message, and no comment links one.