NSIS preparations for upgrade mode

Be more careful about removal of stuff, some more cleanups.