Multicast code cleanup.