Work on removing multicasting as enforced