Remove remaining references to allEvents