Fixed broadcast remove method