chore(hooks): Remove use of global hook/event functions from all classes
Merge pull request #7469 from ewinslow/oo-services-hooks

chore(hooks): Remove use of global hook/event functions from all classes