cleanup the code
more upnp woodoo