windows-only pkgs plus cleanup