fix: Move events to job dispatch and use deleteResources utility function everywhere

fix: Move events to job dispatch and use deleteResources utility function everywhere #490