Removed UPNP code from scripts
Minor changes