Tcp-ip/multicast join cleanup and enhancements