Remove some unnecessary broadcasts