a6384269bc
- Removed unneeded diagnostic events and code - Added and consolidated events into the events defined in the spec