[TIMOB-14617]Code Cleanup. Adding some missing events.