Code cleanup. Removed redundant dependencies on legacy EventInfo from several classes/packages
EventInfo