cleanup the RE and use to properly identify acros such as UPnP.