Removed more stuff specific to broadcasting events