Remove some vestigial events.
merge bug25604 into default