Fixed an issue with multicasting.
Removed unused code.