[win32] clean up win32 installer
Merge pull request #4644 from MartijnKaijser/cleaninstall

[win32] clean up win32 installer