cleanup of weupnp code