Remove hacks, and fix leaving the multicast GID.